Miscellaneous cleanup to silence compiler warnings seen on Mingw.

adunstan · adunstan · commit 0f44335122fd · 2011-12-10T18:15:15.000-05:00
Remove some dead code, conditionally declare some items or call
some code, and fix one or two declarations.
diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
@@ -66,7 +66,9 @@ BitmapHeapNext(BitmapHeapScanState *node)
 	TIDBitmap  *tbm;
 	TBMIterator *tbmiterator;
 	TBMIterateResult *tbmres;
+#ifdef USE_PREFETCH
 	TBMIterator *prefetch_iterator;
+#endif
 	OffsetNumber targoffset;
 	TupleTableSlot *slot;
 
@@ -79,7 +81,9 @@ BitmapHeapNext(BitmapHeapScanState *node)
 	tbm = node->tbm;
 	tbmiterator = node->tbmiterator;
 	tbmres = node->tbmres;
+#ifdef USE_PREFETCH
 	prefetch_iterator = node->prefetch_iterator;
+#endif
 
 	/*
 	 * If we haven't yet performed the underlying index scan, do it, and begin
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
@@ -1554,7 +1554,9 @@ str_tolower(const char *buff, size_t nbytes, Oid collid)
 #endif   /* USE_WIDE_UPPER_LOWER */
 	else
 	{
+#ifdef HAVE_LOCALE_T
 		pg_locale_t mylocale = 0;
+#endif
 		char	   *p;
 
 		if (collid != DEFAULT_COLLATION_OID)
@@ -1570,7 +1572,9 @@ str_tolower(const char *buff, size_t nbytes, Oid collid)
 						 errmsg("could not determine which collation to use for lower() function"),
 						 errhint("Use the COLLATE clause to set the collation explicitly.")));
 			}
+#ifdef HAVE_LOCALE_T
 			mylocale = pg_newlocale_from_collation(collid);
+#endif
 		}
 
 		result = pnstrdup(buff, nbytes);
@@ -1675,7 +1679,9 @@ str_toupper(const char *buff, size_t nbytes, Oid collid)
 #endif   /* USE_WIDE_UPPER_LOWER */
 	else
 	{
+#ifdef HAVE_LOCALE_T
 		pg_locale_t mylocale = 0;
+#endif
 		char	   *p;
 
 		if (collid != DEFAULT_COLLATION_OID)
@@ -1691,7 +1697,9 @@ str_toupper(const char *buff, size_t nbytes, Oid collid)
 						 errmsg("could not determine which collation to use for upper() function"),
 						 errhint("Use the COLLATE clause to set the collation explicitly.")));
 			}
+#ifdef HAVE_LOCALE_T
 			mylocale = pg_newlocale_from_collation(collid);
+#endif
 		}
 
 		result = pnstrdup(buff, nbytes);
@@ -1820,7 +1828,9 @@ str_initcap(const char *buff, size_t nbytes, Oid collid)
 #endif   /* USE_WIDE_UPPER_LOWER */
 	else
 	{
+#ifdef HAVE_LOCALE_T
 		pg_locale_t mylocale = 0;
+#endif
 		char	   *p;
 
 		if (collid != DEFAULT_COLLATION_OID)
@@ -1836,7 +1846,9 @@ str_initcap(const char *buff, size_t nbytes, Oid collid)
 						 errmsg("could not determine which collation to use for initcap() function"),
 						 errhint("Use the COLLATE clause to set the collation explicitly.")));
 			}
+#ifdef HAVE_LOCALE_T
 			mylocale = pg_newlocale_from_collation(collid);
+#endif
 		}
 
 		result = pnstrdup(buff, nbytes);
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
@@ -1299,7 +1299,9 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2, Oid collid)
 		char		a2buf[STACKBUFLEN];
 		char	   *a1p,
 				   *a2p;
+#ifdef HAVE_LOCALE_T
 		pg_locale_t mylocale = 0;
+#endif
 
 		if (collid != DEFAULT_COLLATION_OID)
 		{
@@ -1314,7 +1316,9 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2, Oid collid)
 						 errmsg("could not determine which collation to use for string comparison"),
 						 errhint("Use the COLLATE clause to set the collation explicitly.")));
 			}
+#ifdef HAVE_LOCALE_T
 			mylocale = pg_newlocale_from_collation(collid);
+#endif
 		}
 
 #ifdef WIN32
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -2277,29 +2277,6 @@ check_locale_encoding(const char *locale, int user_enc)
 	return true;
 }
 
-#ifdef WIN32
-
-/*
- * Replace 'needle' with 'replacement' in 'str' . Note that the replacement
- * is done in-place, so 'replacement' must be shorter than 'needle'.
- */
-static void
-strreplace(char *str, char *needle, char *replacement)
-{
-	char	   *s;
-
-	s = strstr(str, needle);
-	if (s != NULL)
-	{
-		int			replacementlen = strlen(replacement);
-		char	   *rest = s + strlen(needle);
-
-		memcpy(s, replacement, replacementlen);
-		memmove(s + replacementlen, rest, strlen(rest) + 1);
-	}
-}
-#endif   /* WIN32 */
-
 /*
  * set up the locale variables
  *
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
@@ -63,7 +63,11 @@ static pid_t bgchild = -1;
 
 /* End position for xlog streaming, empty string if unknown yet */
 static XLogRecPtr xlogendptr;
+#ifndef WIN32
 static int	has_xlogendptr = 0;
+#else
+static volatile LONG has_xlogendptr = 0;
+#endif
 
 /* Function headers */
 static void usage(void);
@@ -1070,10 +1074,11 @@ BaseBackup(void)
 
 	if (bgchild > 0)
 	{
-		int			status;
-
 #ifndef WIN32
+		int			status;
 		int			r;
+#else
+		DWORD       status;
 #endif
 
 		if (verbose)
@@ -1147,7 +1152,7 @@ BaseBackup(void)
 		if (status != 0)
 		{
 			fprintf(stderr, _("%s: child thread exited with error %u\n"),
-					progname, status);
+					progname, (unsigned int) status);
 			disconnect_and_exit(1);
 		}
 		/* Exited normally, we're happy */
diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivexlog.c
@@ -278,12 +278,16 @@ StreamLog(void)
  * When sigint is called, just tell the system to exit at the next possible
  * moment.
  */
+#ifndef WIN32
+
 static void
 sigint_handler(int signum)
 {
 	time_to_abort = true;
 }
 
+#endif
+
 int
 main(int argc, char **argv)
 {
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -1414,7 +1414,6 @@ pgwin32_ServiceMain(DWORD argc, LPTSTR *argv)
 {
 	PROCESS_INFORMATION pi;
 	DWORD		ret;
-	DWORD		check_point_start;
 
 	/* Initialize variables */
 	status.dwWin32ExitCode = S_OK;
@@ -1459,12 +1458,6 @@ pgwin32_ServiceMain(DWORD argc, LPTSTR *argv)
 		write_eventlog(EVENTLOG_INFORMATION_TYPE, _("Server started and accepting connections\n"));
 	}
 
-	/*
-	 * Save the checkpoint value as it might have been incremented in
-	 * test_postmaster_connection
-	 */
-	check_point_start = status.dwCheckPoint;
-
 	pgwin32_SetServiceStatus(SERVICE_RUNNING);
 
 	/* Wait for quit... */
diff --git a/src/bin/pgevent/pgevent.c b/src/bin/pgevent/pgevent.c
@@ -42,7 +42,6 @@ HRESULT
 DllInstall(BOOL bInstall,
 		   LPCWSTR pszCmdLine)
 {
-	size_t		ret;
 
 	if (pszCmdLine && *pszCmdLine != '\0')
 		wcstombs(event_source, pszCmdLine, sizeof(event_source));
diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -130,9 +130,8 @@ timestamp2tm(timestamp dt, int *tzp, struct tm * tm, fsec_t *fsec, char **tzn)
 				date0;
 	double		time;
 #endif
-	time_t		utime;
-
 #if defined(HAVE_TM_ZONE) || defined(HAVE_INT_TIMEZONE)
+	time_t		utime;
 	struct tm  *tx;
 #endif
 
@@ -202,14 +201,15 @@ timestamp2tm(timestamp dt, int *tzp, struct tm * tm, fsec_t *fsec, char **tzn)
 		 */
 		if (IS_VALID_UTIME(tm->tm_year, tm->tm_mon, tm->tm_mday))
 		{
+#if defined(HAVE_TM_ZONE) || defined(HAVE_INT_TIMEZONE)
+
 #ifdef HAVE_INT64_TIMESTAMP
 			utime = dt / USECS_PER_SEC +
 				((date0 - date2j(1970, 1, 1)) * INT64CONST(86400));
 #else
 			utime = dt + (date0 - date2j(1970, 1, 1)) * SECS_PER_DAY;
 #endif
 
-#if defined(HAVE_TM_ZONE) || defined(HAVE_INT_TIMEZONE)
 			tx = localtime(&utime);
 			tm->tm_year = tx->tm_year + 1900;
 			tm->tm_mon = tx->tm_mon + 1;

Original file line number	Diff line number	Diff line change
`@@ -1554,7 +1554,9 @@ str_tolower(const char *buff, size_t nbytes, Oid collid)`
`1554`	`1554`	`#endif /* USE_WIDE_UPPER_LOWER */`
`1555`	`1555`	`else`
`1556`	`1556`	`{`
	`1557`	`+#ifdef HAVE_LOCALE_T`
`1557`	`1558`	`pg_locale_t mylocale = 0;`
	`1559`	`+#endif`
`1558`	`1560`	`char *p;`
`1559`	`1561`
`1560`	`1562`	`if (collid != DEFAULT_COLLATION_OID)`
`@@ -1570,7 +1572,9 @@ str_tolower(const char *buff, size_t nbytes, Oid collid)`
`1570`	`1572`	`errmsg("could not determine which collation to use for lower() function"),`
`1571`	`1573`	`errhint("Use the COLLATE clause to set the collation explicitly.")));`
`1572`	`1574`	`}`
	`1575`	`+#ifdef HAVE_LOCALE_T`
`1573`	`1576`	`mylocale = pg_newlocale_from_collation(collid);`
	`1577`	`+#endif`
`1574`	`1578`	`}`
`1575`	`1579`
`1576`	`1580`	`result = pnstrdup(buff, nbytes);`
`@@ -1675,7 +1679,9 @@ str_toupper(const char *buff, size_t nbytes, Oid collid)`
`1675`	`1679`	`#endif /* USE_WIDE_UPPER_LOWER */`
`1676`	`1680`	`else`
`1677`	`1681`	`{`
	`1682`	`+#ifdef HAVE_LOCALE_T`
`1678`	`1683`	`pg_locale_t mylocale = 0;`
	`1684`	`+#endif`
`1679`	`1685`	`char *p;`
`1680`	`1686`
`1681`	`1687`	`if (collid != DEFAULT_COLLATION_OID)`
`@@ -1691,7 +1697,9 @@ str_toupper(const char *buff, size_t nbytes, Oid collid)`
`1691`	`1697`	`errmsg("could not determine which collation to use for upper() function"),`
`1692`	`1698`	`errhint("Use the COLLATE clause to set the collation explicitly.")));`
`1693`	`1699`	`}`
	`1700`	`+#ifdef HAVE_LOCALE_T`
`1694`	`1701`	`mylocale = pg_newlocale_from_collation(collid);`
	`1702`	`+#endif`
`1695`	`1703`	`}`
`1696`	`1704`
`1697`	`1705`	`result = pnstrdup(buff, nbytes);`
`@@ -1820,7 +1828,9 @@ str_initcap(const char *buff, size_t nbytes, Oid collid)`
`1820`	`1828`	`#endif /* USE_WIDE_UPPER_LOWER */`
`1821`	`1829`	`else`
`1822`	`1830`	`{`
	`1831`	`+#ifdef HAVE_LOCALE_T`
`1823`	`1832`	`pg_locale_t mylocale = 0;`
	`1833`	`+#endif`
`1824`	`1834`	`char *p;`
`1825`	`1835`
`1826`	`1836`	`if (collid != DEFAULT_COLLATION_OID)`
`@@ -1836,7 +1846,9 @@ str_initcap(const char *buff, size_t nbytes, Oid collid)`
`1836`	`1846`	`errmsg("could not determine which collation to use for initcap() function"),`
`1837`	`1847`	`errhint("Use the COLLATE clause to set the collation explicitly.")));`
`1838`	`1848`	`}`
	`1849`	`+#ifdef HAVE_LOCALE_T`
`1839`	`1850`	`mylocale = pg_newlocale_from_collation(collid);`
	`1851`	`+#endif`
`1840`	`1852`	`}`
`1841`	`1853`
`1842`	`1854`	`result = pnstrdup(buff, nbytes);`
Original file line number	Diff line number	Diff line change
`@@ -1299,7 +1299,9 @@ varstr_cmp(char arg1, int len1, char arg2, int len2, Oid collid)`
`1299`	`1299`	`char a2buf[STACKBUFLEN];`
`1300`	`1300`	`char *a1p,`
`1301`	`1301`	`*a2p;`
	`1302`	`+#ifdef HAVE_LOCALE_T`
`1302`	`1303`	`pg_locale_t mylocale = 0;`
	`1304`	`+#endif`
`1303`	`1305`
`1304`	`1306`	`if (collid != DEFAULT_COLLATION_OID)`
`1305`	`1307`	`{`
`@@ -1314,7 +1316,9 @@ varstr_cmp(char arg1, int len1, char arg2, int len2, Oid collid)`
`1314`	`1316`	`errmsg("could not determine which collation to use for string comparison"),`
`1315`	`1317`	`errhint("Use the COLLATE clause to set the collation explicitly.")));`
`1316`	`1318`	`}`
	`1319`	`+#ifdef HAVE_LOCALE_T`
`1317`	`1320`	`mylocale = pg_newlocale_from_collation(collid);`
	`1321`	`+#endif`
`1318`	`1322`	`}`
`1319`	`1323`
`1320`	`1324`	`#ifdef WIN32`
Original file line number	Diff line number	Diff line change
`@@ -278,12 +278,16 @@ StreamLog(void)`
`278`	`278`	`* When sigint is called, just tell the system to exit at the next possible`
`279`	`279`	`* moment.`
`280`	`280`	`*/`
	`281`	`+#ifndef WIN32`
	`282`	`+`
`281`	`283`	`static void`
`282`	`284`	`sigint_handler(int signum)`
`283`	`285`	`{`
`284`	`286`	`time_to_abort = true;`
`285`	`287`	`}`
`286`	`288`
	`289`	`+#endif`
	`290`	`+`
`287`	`291`	`int`
`288`	`292`	`main(int argc, char **argv)`
`289`	`293`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ HRESULT`
`42`	`42`	`DllInstall(BOOL bInstall,`
`43`	`43`	`LPCWSTR pszCmdLine)`
`44`	`44`	`{`
`45`		`- size_t ret;`
`46`	`45`
`47`	`46`	`if (pszCmdLine && *pszCmdLine != '\0')`
`48`	`47`	`wcstombs(event_source, pszCmdLine, sizeof(event_source));`