From: Robert Haas <rhaas@postgresql.org>
Date: Wed, 9 Apr 2014 17:01:00 +0000 (+0000)
Subject: Fix compiler warnings.
X-Git-Url: http://git.postgresql.org/gitweb/static/developers.postgresql.org?a=commitdiff_plain;h=aa665e77f7870a9e281402bb02e37afc9468bff0;p=users%2Frhaas%2Fpostgres.git

Fix compiler warnings.
---

diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c
index 52b6c27395..39cd498671 100644
--- a/src/backend/utils/mmgr/freepage.c
+++ b/src/backend/utils/mmgr/freepage.c
@@ -500,7 +500,7 @@ static Size
 FreePageBtreeCleanup(FreePageManager *fpm)
 {
 	char *base = fpm_segment_base(fpm);
-	Size	max_contiguous_pages;
+	Size	max_contiguous_pages = 0;
 
 	/* Attempt to shrink the depth of the btree. */
 	while (!relptr_is_null(fpm->btree_root))
diff --git a/src/backend/utils/mmgr/sb_alloc.c b/src/backend/utils/mmgr/sb_alloc.c
index 44ff967161..f97a52d7f2 100644
--- a/src/backend/utils/mmgr/sb_alloc.c
+++ b/src/backend/utils/mmgr/sb_alloc.c
@@ -194,7 +194,7 @@ sb_alloc(sb_allocator *a, Size size, int flags)
 		Size	first_page;
 		sb_span *span;
 		int	heapproc = MyProcPid % a->heaps_per_size_class;
-		int	heapno = heapproc * SB_NUM_SIZE_CLASSES + size_class;
+		int	heapno = heapproc * SB_NUM_SIZE_CLASSES + SB_SCLASS_SPAN_LARGE;
 		sb_heap *heap = &a->heaps[heapno];
 		LWLock *lock = relptr_access(base, heap->lock);
 		void *ptr;
@@ -227,7 +227,7 @@ sb_alloc(sb_allocator *a, Size size, int flags)
 		/* Initialize span and pagemap. */
 		if (lock != NULL)
 			LWLockAcquire(lock, LW_EXCLUSIVE);
-		sb_init_span(base, span, heap, ptr, npages, size_class);
+		sb_init_span(base, span, heap, ptr, npages, SB_SCLASS_SPAN_LARGE);
 		if (lock != NULL)
 			LWLockRelease(lock);
 		sb_map_set(region->pagemap, first_page, span);
diff --git a/src/backend/utils/mmgr/sb_region.c b/src/backend/utils/mmgr/sb_region.c
index 6c442269b7..6d1737c4df 100644
--- a/src/backend/utils/mmgr/sb_region.c
+++ b/src/backend/utils/mmgr/sb_region.c
@@ -537,7 +537,7 @@ sb_adjust_lookup_leaf(sb_lookup_leaf *leaf, sb_region *region, bool insert)
 		sb_region *candidate;
 
 		mid = (high + low) / 2;
-		region = leaf->region[mid];
+		candidate = leaf->region[mid];
 		if (candidate->region_start > region->region_start)
 			high = mid;
 		else if (candidate->region_start < region->region_start)