Fix walmethods.c build without libz

mhagander · mhagander · commit 9ae6713cdf32 · 2016-10-23T16:00:42.000+02:00
Per numerous buildfarm manuals
diff --git a/src/bin/pg_basebackup/walmethods.c b/src/bin/pg_basebackup/walmethods.c
@@ -416,6 +416,9 @@ tar_write(Walfile f, const void *buf, size_t count)
 		return count;
 	}
 #endif
+	else
+		/* Can't happen - compression enabled with no libz */
+		return -1;
 }
 
 static bool
@@ -879,8 +882,10 @@ CreateWalTarMethod(const char *tarbase, int compression, bool sync)
 	tar_data->fd = -1;
 	tar_data->compression = compression;
 	tar_data->sync = sync;
+#ifdef HAVE_LIBZ
 	if (compression)
 		tar_data->zlibOut = (char *) pg_malloc(ZLIB_OUT_SIZE + 1);
+#endif
 
 	return method;
 }

Original file line number	Diff line number	Diff line change
`@@ -416,6 +416,9 @@ tar_write(Walfile f, const void *buf, size_t count)`
`416`	`416`	`return count;`
`417`	`417`	`}`
`418`	`418`	`#endif`
	`419`	`+ else`
	`420`	`+ /* Can't happen - compression enabled with no libz */`
	`421`	`+ return -1;`
`419`	`422`	`}`
`420`	`423`
`421`	`424`	`static bool`
`@@ -879,8 +882,10 @@ CreateWalTarMethod(const char *tarbase, int compression, bool sync)`
`879`	`882`	`tar_data->fd = -1;`
`880`	`883`	`tar_data->compression = compression;`
`881`	`884`	`tar_data->sync = sync;`
	`885`	`+#ifdef HAVE_LIBZ`
`882`	`886`	`if (compression)`
`883`	`887`	`tar_data->zlibOut = (char *) pg_malloc(ZLIB_OUT_SIZE + 1);`
	`888`	`+#endif`
`884`	`889`
`885`	`890`	`return method;`
`886`	`891`	`}`