ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Avoid shadowing variables "a", "nt" and "fd".

This commit is contained in:
Marcus Meissner 2011-10-21 08:19:17 +02:00 committed by Alexandre Julliard
parent 69b713618b
commit 615e9572f1
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/kernel32/process.c
View File

@ -804,7 +804,6 @@ static BOOL build_command_line( WCHAR **argv )
*p++='"'; *p++='"';
if (has_quote) { if (has_quote) {
int bcount; int bcount;
WCHAR* a;
bcount=0; bcount=0;
a=*arg; a=*arg;
@ -1510,17 +1509,16 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA
if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS))
{ {
int pid;
if (!(pid = fork())) if (!(pid = fork()))
{ {
int fd = open( "/dev/null", O_RDWR ); int nullfd = open( "/dev/null", O_RDWR );
setsid(); setsid();
/* close stdin and stdout */ /* close stdin and stdout */
if (fd != -1) if (nullfd != -1)
{ {
dup2( fd, 0 ); dup2( nullfd, 0 );
dup2( fd, 1 ); dup2( nullfd, 1 );
close( fd ); close( nullfd );
} }
} }
else if (pid != -1) _exit(0); /* parent */ else if (pid != -1) _exit(0); /* parent */
@ -2250,14 +2248,14 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A
if (env && !(flags & CREATE_UNICODE_ENVIRONMENT)) /* convert environment to unicode */ if (env && !(flags & CREATE_UNICODE_ENVIRONMENT)) /* convert environment to unicode */
{ {
char *p = env; char *e = env;
DWORD lenW; DWORD lenW;
while (*p) p += strlen(p) + 1; while (*e) e += strlen(e) + 1;
p++; /* final null */ e++; /* final null */
lenW = MultiByteToWideChar( CP_ACP, 0, env, p - (char*)env, NULL, 0 ); lenW = MultiByteToWideChar( CP_ACP, 0, env, e - (char*)env, NULL, 0 );
envW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ); envW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) );
MultiByteToWideChar( CP_ACP, 0, env, p - (char*)env, envW, lenW ); MultiByteToWideChar( CP_ACP, 0, env, e - (char*)env, envW, lenW );
flags |= CREATE_UNICODE_ENVIRONMENT; flags |= CREATE_UNICODE_ENVIRONMENT;
} }
@ -3206,11 +3204,11 @@ DWORD WINAPI GetProcessVersion( DWORD pid )
if (!pid || pid == GetCurrentProcessId()) if (!pid || pid == GetCurrentProcessId())
{ {
IMAGE_NT_HEADERS *nt; IMAGE_NT_HEADERS *pnt;
if ((nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ))) if ((pnt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress )))
return ((nt->OptionalHeader.MajorSubsystemVersion << 16) | return ((pnt->OptionalHeader.MajorSubsystemVersion << 16) |
nt->OptionalHeader.MinorSubsystemVersion); pnt->OptionalHeader.MinorSubsystemVersion);
return 0; return 0;
} }