diff options
| author | Charles Forsyth <charles.forsyth@gmail.com> | 2015-07-24 16:01:08 +0100 |
|---|---|---|
| committer | Charles Forsyth <charles.forsyth@gmail.com> | 2015-07-24 16:01:08 +0100 |
| commit | eeab83bd37f292b90f79cf43cf607cc60181e2f9 (patch) | |
| tree | 2d48b20cfac436cba44d4cf8fb7c4e1b89086f0f | |
| parent | 8ac6e05111a5a8da4e9ab49d7cb1e2b577cd37bf (diff) | |
more pollution of name space by MS. issue 339
| -rw-r--r-- | utils/ntsrv/ntsrv.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/utils/ntsrv/ntsrv.c b/utils/ntsrv/ntsrv.c index 881a0c3f..0bb79a36 100644 --- a/utils/ntsrv/ntsrv.c +++ b/utils/ntsrv/ntsrv.c @@ -66,7 +66,7 @@ static SERVICE_STATUS_HANDLE statush; static HANDLE emujob; /* win32 job object for emu session */ static DWORD emugroup; /* process group ID for emu session */ static HANDLE emuin; /* stdin pipe of emu */ -static HANDLE logf; +static HANDLE logfile; HANDLE openlog(char*); void logmsg(char*, ...); @@ -186,7 +186,7 @@ infmain(ulong argc, char *argv[]) argc--; argv++; cmd = smprint("%s\\%s", root, LOGFILE); - logf = openlog(cmd); + logfile = openlog(cmd); free(cmd); statush = RegisterServiceCtrlHandler(name, infctl); if (statush == 0) @@ -209,7 +209,7 @@ infmain(ulong argc, char *argv[]) } cp.in = emu.stdout; - cp.out = logf; + cp.out = logfile; cpt = CreateThread(NULL, 0, copy, (void*)&cp, 0, &tid); if (cpt == NULL) { logmsg("failed to create copy thread: %r"); @@ -253,8 +253,8 @@ infmain(ulong argc, char *argv[]) SleepEx(10000, FALSE); } logmsg("infmain done"); - if (logf) - CloseHandle(logf); + if (logfile) + CloseHandle(logfile); status.dwCurrentState = SERVICE_STOPPED; SetServiceStatus(statush, &status); return; @@ -387,15 +387,15 @@ logmsg(char *fmt, ...) int n; char *p; va_list args; - if(logf == 0) + if(logfile == 0) return; va_start(args, fmt); p = vsmprint(fmt, args); va_end(args); n = strlen(p); if (n) - WriteFile(logf, p, n, &n, NULL); - WriteFile(logf, "\n", 1, &n, NULL); + WriteFile(logfile, p, n, &n, NULL); + WriteFile(logfile, "\n", 1, &n, NULL); } Emu |