Fix MinGW warnings re formats and unused variables. per ITAGAKI Takahiro

adunstan · adunstan · commit 74be86847c8c · 2008-04-16T22:16:00.000Z
diff --git a/src/backend/port/win32/signal.c b/src/backend/port/win32/signal.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.20 2008/01/01 19:45:51 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.21 2008/04/16 22:16:00 adunstan Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -251,7 +251,7 @@ pg_signal_thread(LPVOID param)
 	char		pipename[128];
 	HANDLE		pipe = pgwin32_initial_signal_pipe;
 
-	snprintf(pipename, sizeof(pipename), "\\\\.\\pipe\\pgsignal_%u", GetCurrentProcessId());
+	snprintf(pipename, sizeof(pipename), "\\\\.\\pipe\\pgsignal_%lu", GetCurrentProcessId());
 
 	for (;;)
 	{
diff --git a/src/port/exec.c b/src/port/exec.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/exec.c,v 1.59 2008/03/31 01:31:43 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/port/exec.c,v 1.60 2008/04/16 22:16:00 adunstan Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -695,7 +695,6 @@ AddUserToDacl(HANDLE hProcess)
 	DWORD		dwNewAclSize;
 	DWORD		dwSize = 0;
 	DWORD		dwTokenInfoLength = 0;
-	DWORD		dwResult = 0;
 	HANDLE		hToken = NULL;
 	PACL		pacl = NULL;
 	PSID		psidUser = NULL;
@@ -707,7 +706,7 @@ AddUserToDacl(HANDLE hProcess)
 	/* Get the token for the process */
 	if (!OpenProcessToken(hProcess, TOKEN_QUERY | TOKEN_ADJUST_DEFAULT, &hToken))
 	{
-		log_error("could not open process token: %ui", GetLastError());
+		log_error("could not open process token: %lu", GetLastError());
 		goto cleanup;
 	}
 
@@ -719,19 +718,19 @@ AddUserToDacl(HANDLE hProcess)
 			ptdd = (TOKEN_DEFAULT_DACL *) LocalAlloc(LPTR, dwSize);
 			if (ptdd == NULL)
 			{
-				log_error("could not allocate %i bytes of memory", dwSize);
+				log_error("could not allocate %lu bytes of memory", dwSize);
 				goto cleanup;
 			}
 
 			if (!GetTokenInformation(hToken, tic, (LPVOID) ptdd, dwSize, &dwSize))
 			{
-				log_error("could not get token information: %ui", GetLastError());
+				log_error("could not get token information: %lu", GetLastError());
 				goto cleanup;
 			}
 		}
 		else
 		{
-			log_error("could not get token information buffer size: %ui", GetLastError());
+			log_error("could not get token information buffer size: %lu", GetLastError());
 			goto cleanup;
 		}
 	}
@@ -741,14 +740,14 @@ AddUserToDacl(HANDLE hProcess)
 						   (DWORD) sizeof(ACL_SIZE_INFORMATION),
 						   AclSizeInformation))
 	{
-		log_error("could not get ACL information: %ui", GetLastError());
+		log_error("could not get ACL information: %lu", GetLastError());
 		goto cleanup;
 	}
 
 	/* Get the SID for the current user. We need to add this to the ACL. */
 	if (!GetUserSid(&psidUser, hToken))
 	{
-		log_error("could not get user SID: %ui", GetLastError());
+		log_error("could not get user SID: %lu", GetLastError());
 		goto cleanup;
 	}
 
@@ -759,13 +758,13 @@ AddUserToDacl(HANDLE hProcess)
 	pacl = (PACL) LocalAlloc(LPTR, dwNewAclSize);
 	if (pacl == NULL)
 	{
-		log_error("could not allocate %i bytes of memory", dwNewAclSize);
+		log_error("could not allocate %lu bytes of memory", dwNewAclSize);
 		goto cleanup;
 	}
 
 	if (!InitializeAcl(pacl, dwNewAclSize, ACL_REVISION))
 	{
-		log_error("could not initialize ACL: %ui", GetLastError());
+		log_error("could not initialize ACL: %lu", GetLastError());
 		goto cleanup;
 	}
 
@@ -774,21 +773,21 @@ AddUserToDacl(HANDLE hProcess)
 	{
 		if (!GetAce(ptdd->DefaultDacl, i, (LPVOID *) & pace))
 		{
-			log_error("could not get ACE: %ui", GetLastError());
+			log_error("could not get ACE: %lu", GetLastError());
 			goto cleanup;
 		}
 
 		if (!AddAce(pacl, ACL_REVISION, MAXDWORD, pace, ((PACE_HEADER) pace)->AceSize))
 		{
-			log_error("could not add ACE: %ui", GetLastError());
+			log_error("could not add ACE: %lu", GetLastError());
 			goto cleanup;
 		}
 	}
 
 	/* Add the new ACE for the current user */
 	if (!AddAccessAllowedAce(pacl, ACL_REVISION, GENERIC_ALL, psidUser))
 	{
-		log_error("could not add access allowed ACE: %ui", GetLastError());
+		log_error("could not add access allowed ACE: %lu", GetLastError());
 		goto cleanup;
 	}
 
@@ -797,7 +796,7 @@ AddUserToDacl(HANDLE hProcess)
 
 	if (!SetTokenInformation(hToken, tic, (LPVOID) & tddNew, dwNewAclSize))
 	{
-		log_error("could not set token information: %ui", GetLastError());
+		log_error("could not set token information: %lu", GetLastError());
 		goto cleanup;
 	}
 
@@ -828,8 +827,6 @@ static BOOL
 GetUserSid(PSID * ppSidUser, HANDLE hToken)
 {
 	DWORD		dwLength;
-	DWORD		cbName = 250;
-	DWORD		cbDomainName = 250;
 	PTOKEN_USER pTokenUser = NULL;
 
 
@@ -845,13 +842,13 @@ GetUserSid(PSID * ppSidUser, HANDLE hToken)
 
 			if (pTokenUser == NULL)
 			{
-				log_error("could not allocate %ui bytes of memory", dwLength);
+				log_error("could not allocate %lu bytes of memory", dwLength);
 				return FALSE;
 			}
 		}
 		else
 		{
-			log_error("could not get token information buffer size: %ui", GetLastError());
+			log_error("could not get token information buffer size: %lu", GetLastError());
 			return FALSE;
 		}
 	}
@@ -865,7 +862,7 @@ GetUserSid(PSID * ppSidUser, HANDLE hToken)
 		HeapFree(GetProcessHeap(), 0, pTokenUser);
 		pTokenUser = NULL;
 
-		log_error("could not get token information: %ui", GetLastError());
+		log_error("could not get token information: %lu", GetLastError());
 		return FALSE;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.20 2008/01/01 19:45:51 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.21 2008/04/16 22:16:00 adunstan Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -251,7 +251,7 @@ pg_signal_thread(LPVOID param)`
`251`	`251`	`char pipename[128];`
`252`	`252`	`HANDLE pipe = pgwin32_initial_signal_pipe;`
`253`	`253`
`254`		`- snprintf(pipename, sizeof(pipename), "\\\\.\\pipe\\pgsignal_%u", GetCurrentProcessId());`
	`254`	`+ snprintf(pipename, sizeof(pipename), "\\\\.\\pipe\\pgsignal_%lu", GetCurrentProcessId());`
`255`	`255`
`256`	`256`	`for (;;)`
`257`	`257`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/port/exec.c,v 1.59 2008/03/31 01:31:43 tgl Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/port/exec.c,v 1.60 2008/04/16 22:16:00 adunstan Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -695,7 +695,6 @@ AddUserToDacl(HANDLE hProcess)`
`695`	`695`	`DWORD dwNewAclSize;`
`696`	`696`	`DWORD dwSize = 0;`
`697`	`697`	`DWORD dwTokenInfoLength = 0;`
`698`		`- DWORD dwResult = 0;`
`699`	`698`	`HANDLE hToken = NULL;`
`700`	`699`	`PACL pacl = NULL;`
`701`	`700`	`PSID psidUser = NULL;`
`@@ -707,7 +706,7 @@ AddUserToDacl(HANDLE hProcess)`
`707`	`706`	`/* Get the token for the process */`
`708`	`707`	`if (!OpenProcessToken(hProcess, TOKEN_QUERY \| TOKEN_ADJUST_DEFAULT, &hToken))`
`709`	`708`	`{`
`710`		`- log_error("could not open process token: %ui", GetLastError());`
	`709`	`+ log_error("could not open process token: %lu", GetLastError());`
`711`	`710`	`goto cleanup;`
`712`	`711`	`}`
`713`	`712`
`@@ -719,19 +718,19 @@ AddUserToDacl(HANDLE hProcess)`
`719`	`718`	`ptdd = (TOKEN_DEFAULT_DACL *) LocalAlloc(LPTR, dwSize);`
`720`	`719`	`if (ptdd == NULL)`
`721`	`720`	`{`
`722`		`- log_error("could not allocate %i bytes of memory", dwSize);`
	`721`	`+ log_error("could not allocate %lu bytes of memory", dwSize);`
`723`	`722`	`goto cleanup;`
`724`	`723`	`}`
`725`	`724`
`726`	`725`	`if (!GetTokenInformation(hToken, tic, (LPVOID) ptdd, dwSize, &dwSize))`
`727`	`726`	`{`
`728`		`- log_error("could not get token information: %ui", GetLastError());`
	`727`	`+ log_error("could not get token information: %lu", GetLastError());`
`729`	`728`	`goto cleanup;`
`730`	`729`	`}`
`731`	`730`	`}`
`732`	`731`	`else`
`733`	`732`	`{`
`734`		`- log_error("could not get token information buffer size: %ui", GetLastError());`
	`733`	`+ log_error("could not get token information buffer size: %lu", GetLastError());`
`735`	`734`	`goto cleanup;`
`736`	`735`	`}`
`737`	`736`	`}`
`@@ -741,14 +740,14 @@ AddUserToDacl(HANDLE hProcess)`
`741`	`740`	`(DWORD) sizeof(ACL_SIZE_INFORMATION),`
`742`	`741`	`AclSizeInformation))`
`743`	`742`	`{`
`744`		`- log_error("could not get ACL information: %ui", GetLastError());`
	`743`	`+ log_error("could not get ACL information: %lu", GetLastError());`
`745`	`744`	`goto cleanup;`
`746`	`745`	`}`
`747`	`746`
`748`	`747`	`/* Get the SID for the current user. We need to add this to the ACL. */`
`749`	`748`	`if (!GetUserSid(&psidUser, hToken))`
`750`	`749`	`{`
`751`		`- log_error("could not get user SID: %ui", GetLastError());`
	`750`	`+ log_error("could not get user SID: %lu", GetLastError());`
`752`	`751`	`goto cleanup;`
`753`	`752`	`}`
`754`	`753`
`@@ -759,13 +758,13 @@ AddUserToDacl(HANDLE hProcess)`
`759`	`758`	`pacl = (PACL) LocalAlloc(LPTR, dwNewAclSize);`
`760`	`759`	`if (pacl == NULL)`
`761`	`760`	`{`
`762`		`- log_error("could not allocate %i bytes of memory", dwNewAclSize);`
	`761`	`+ log_error("could not allocate %lu bytes of memory", dwNewAclSize);`
`763`	`762`	`goto cleanup;`
`764`	`763`	`}`
`765`	`764`
`766`	`765`	`if (!InitializeAcl(pacl, dwNewAclSize, ACL_REVISION))`
`767`	`766`	`{`
`768`		`- log_error("could not initialize ACL: %ui", GetLastError());`
	`767`	`+ log_error("could not initialize ACL: %lu", GetLastError());`
`769`	`768`	`goto cleanup;`
`770`	`769`	`}`
`771`	`770`
`@@ -774,21 +773,21 @@ AddUserToDacl(HANDLE hProcess)`
`774`	`773`	`{`
`775`	`774`	`if (!GetAce(ptdd->DefaultDacl, i, (LPVOID *) & pace))`
`776`	`775`	`{`
`777`		`- log_error("could not get ACE: %ui", GetLastError());`
	`776`	`+ log_error("could not get ACE: %lu", GetLastError());`
`778`	`777`	`goto cleanup;`
`779`	`778`	`}`
`780`	`779`
`781`	`780`	`if (!AddAce(pacl, ACL_REVISION, MAXDWORD, pace, ((PACE_HEADER) pace)->AceSize))`
`782`	`781`	`{`
`783`		`- log_error("could not add ACE: %ui", GetLastError());`
	`782`	`+ log_error("could not add ACE: %lu", GetLastError());`
`784`	`783`	`goto cleanup;`
`785`	`784`	`}`
`786`	`785`	`}`
`787`	`786`
`788`	`787`	`/* Add the new ACE for the current user */`
`789`	`788`	`if (!AddAccessAllowedAce(pacl, ACL_REVISION, GENERIC_ALL, psidUser))`
`790`	`789`	`{`
`791`		`- log_error("could not add access allowed ACE: %ui", GetLastError());`
	`790`	`+ log_error("could not add access allowed ACE: %lu", GetLastError());`
`792`	`791`	`goto cleanup;`
`793`	`792`	`}`
`794`	`793`
`@@ -797,7 +796,7 @@ AddUserToDacl(HANDLE hProcess)`
`797`	`796`
`798`	`797`	`if (!SetTokenInformation(hToken, tic, (LPVOID) & tddNew, dwNewAclSize))`
`799`	`798`	`{`
`800`		`- log_error("could not set token information: %ui", GetLastError());`
	`799`	`+ log_error("could not set token information: %lu", GetLastError());`
`801`	`800`	`goto cleanup;`
`802`	`801`	`}`
`803`	`802`
`@@ -828,8 +827,6 @@ static BOOL`
`828`	`827`	`GetUserSid(PSID * ppSidUser, HANDLE hToken)`
`829`	`828`	`{`
`830`	`829`	`DWORD dwLength;`
`831`		`- DWORD cbName = 250;`
`832`		`- DWORD cbDomainName = 250;`
`833`	`830`	`PTOKEN_USER pTokenUser = NULL;`
`834`	`831`
`835`	`832`
`@@ -845,13 +842,13 @@ GetUserSid(PSID * ppSidUser, HANDLE hToken)`
`845`	`842`
`846`	`843`	`if (pTokenUser == NULL)`
`847`	`844`	`{`
`848`		`- log_error("could not allocate %ui bytes of memory", dwLength);`
	`845`	`+ log_error("could not allocate %lu bytes of memory", dwLength);`
`849`	`846`	`return FALSE;`
`850`	`847`	`}`
`851`	`848`	`}`
`852`	`849`	`else`
`853`	`850`	`{`
`854`		`- log_error("could not get token information buffer size: %ui", GetLastError());`
	`851`	`+ log_error("could not get token information buffer size: %lu", GetLastError());`
`855`	`852`	`return FALSE;`
`856`	`853`	`}`
`857`	`854`	`}`
`@@ -865,7 +862,7 @@ GetUserSid(PSID * ppSidUser, HANDLE hToken)`
`865`	`862`	`HeapFree(GetProcessHeap(), 0, pTokenUser);`
`866`	`863`	`pTokenUser = NULL;`
`867`	`864`
`868`		`- log_error("could not get token information: %ui", GetLastError());`
	`865`	`+ log_error("could not get token information: %lu", GetLastError());`
`869`	`866`	`return FALSE;`
`870`	`867`	`}`
`871`	`868`