Fixed compiler warinings

vbwagner · vbwagner · commit d5895661503f · 2016-01-26T14:37:41.000+03:00
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
@@ -3586,11 +3586,17 @@ static void
 TerminateBufferIO(volatile BufferDesc *buf, bool clear_dirty,
 				  int set_flag_bits)
 {
+#ifdef 	USE_ASSERT_CHECKING
 	uint32		state;
+#endif
 
 	Assert(buf == InProgressBuf);
 
-	state = LockBufHdr(buf);
+#ifdef USE_ASSERT_CHECKING
+	state = 
+#endif
+		LockBufHdr(buf);
+
 
 	Assert(state & BM_IO_IN_PROGRESS);
 
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
@@ -1511,7 +1511,10 @@ str_tolower(const char *buff, size_t nbytes, Oid collid)
 		UChar       sourcebuf[STACKBUFLEN], destbuf[STACKBUFLEN];
 		UChar      *source, *dest;
 		int			buflen;
-		size_t		result_size, usize;
+		size_t		result_size;
+#ifdef USE_ASSERT_CHECKING		
+		size_t		usize;
+#endif
 		UErrorCode  status = U_ZERO_ERROR;
 
 		if (conv == NULL)
@@ -1558,8 +1561,10 @@ str_tolower(const char *buff, size_t nbytes, Oid collid)
 		// and convert modified utf-16 string back to text
 		result_size = UCNV_GET_MAX_BYTES_FOR_STRING(buflen, ucnv_getMaxCharSize(conv));
 		result = palloc(result_size);
-
-		usize = ucnv_fromUChars(conv, result, result_size,
+#ifdef USE_ASSERT_CHECKING
+		usize = 
+#endif		
+		     ucnv_fromUChars(conv, result, result_size,
 								 dest, buflen, &status);
 
 		if (U_FAILURE(status))
@@ -1708,7 +1713,10 @@ str_toupper(const char *buff, size_t nbytes, Oid collid)
 		UChar       sourcebuf[STACKBUFLEN], destbuf[STACKBUFLEN];
 		UChar      *source, *dest;
 		int			buflen;
-		size_t		result_size, usize;
+		size_t		result_size;
+#ifdef USE_ASSERT_CHECKING		
+		size_t		 usize;
+#endif		
 		UErrorCode  status = U_ZERO_ERROR;
 
 		if (conv == NULL)
@@ -1755,8 +1763,10 @@ str_toupper(const char *buff, size_t nbytes, Oid collid)
 		// and convert modified utf-16 string back to text
 		result_size = UCNV_GET_MAX_BYTES_FOR_STRING(buflen, ucnv_getMaxCharSize(conv));
 		result = palloc(result_size);
-
-		usize = ucnv_fromUChars(conv, result, result_size,
+#ifdef USE_ASSERT_CHECKING
+		usize = 
+#endif		
+			ucnv_fromUChars(conv, result, result_size,
 								 dest, buflen, &status);
 
 		if (U_FAILURE(status))
@@ -1906,7 +1916,10 @@ str_initcap(const char *buff, size_t nbytes, Oid collid)
 		UChar       sourcebuf[STACKBUFLEN], destbuf[STACKBUFLEN];
 		UChar      *source, *dest;
 		int			buflen;
-		size_t		result_size, usize;
+		size_t		result_size;
+#ifdef USE_ASSERT_CHECKING		
+		size_t usize;
+#endif		
 		UErrorCode  status = U_ZERO_ERROR;
 
 		if (conv == NULL)
@@ -1953,8 +1966,10 @@ str_initcap(const char *buff, size_t nbytes, Oid collid)
 		// and convert modified utf-16 string back to text
 		result_size = UCNV_GET_MAX_BYTES_FOR_STRING(buflen, ucnv_getMaxCharSize(conv));
 		result = palloc(result_size);
-
-		usize = ucnv_fromUChars(conv, result, result_size,
+#ifdef USE_ASSERT_CHECKING
+		usize = 
+#endif		
+		ucnv_fromUChars(conv, result, result_size,
 								 dest, buflen, &status);
 
 		if (U_FAILURE(status))
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
@@ -1204,8 +1204,7 @@ get_hash_entry(HTAB *hashp, int partition_idx)
 {
 	HASHHDR    *hctl = hashp->hctl;
 	HASHBUCKET	newElement;
-	int			i,
-				borrow_from_idx;
+	int			borrow_from_idx;
 
 	for (;;)
 	{

Original file line number	Diff line number	Diff line change
`@@ -1204,8 +1204,7 @@ get_hash_entry(HTAB *hashp, int partition_idx)`
`1204`	`1204`	`{`
`1205`	`1205`	`HASHHDR *hctl = hashp->hctl;`
`1206`	`1206`	`HASHBUCKET newElement;`
`1207`		`- int i,`
`1208`		`- borrow_from_idx;`
	`1207`	`+ int borrow_from_idx;`
`1209`	`1208`
`1210`	`1209`	`for (;;)`
`1211`	`1210`	`{`