From 3cba22b9a5c2664f8e1b19fbfbfa018208c970b8 Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Wed, 19 Oct 2016 13:56:15 -0700 Subject: [PATCH] tst: winfsp-tests: replace abort with ABORT in HookCreateFile, etc. --- tst/winfsp-tests/winfsp-tests.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tst/winfsp-tests/winfsp-tests.c b/tst/winfsp-tests/winfsp-tests.c index 7cc4ba7f..89b8fe8a 100644 --- a/tst/winfsp-tests/winfsp-tests.c +++ b/tst/winfsp-tests/winfsp-tests.c @@ -3,6 +3,13 @@ #include "winfsp-tests.h" +#define ABORT()\ + do\ + {\ + tlib_printf("ABORT: %s:%s:%d\n", __func__, __FILE__, __LINE__);\ + abort();\ + } while (0,0) + int NtfsTests = 0; int WinFspDiskTests = 1; int WinFspNetTests = 1; @@ -84,7 +91,7 @@ HANDLE HookCreateFileW( else if (testalpha(FileNameBuf[0]) && L':' == FileNameBuf[1] && L'\\' == FileNameBuf[2]) P = FileNameBuf + 3; else - abort(); + ABORT(); for (EndP = P + wcslen(P); EndP > P; P++) if (testalpha(*P) && myrand() <= (TogglePercent) * 0x7fff / 100) @@ -119,7 +126,7 @@ HANDLE HookCreateFileW( else if (testalpha(FileNameBuf[0]) && L':' == FileNameBuf[1] && L'\\' == FileNameBuf[2]) ; else - abort(); + ABORT(); } if (OptNoTraverseToken) @@ -128,7 +135,7 @@ HANDLE HookCreateFileW( Privileges.Privileges[0].Attributes = 0; Privileges.Privileges[0].Luid = OptNoTraverseLuid; if (!AdjustTokenPrivileges(OptNoTraverseToken, FALSE, &Privileges, 0, 0, 0)) - abort(); + ABORT(); } HANDLE h = CreateFileW( @@ -147,7 +154,7 @@ HANDLE HookCreateFileW( Privileges.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; Privileges.Privileges[0].Luid = OptNoTraverseLuid; if (!AdjustTokenPrivileges(OptNoTraverseToken, FALSE, &Privileges, 0, 0, 0)) - abort(); + ABORT(); } #if 0