Fix compiler warning about unused function in non-readline case.

adunstan · adunstan · commit 8a0aa686f41f · 2015-09-28T18:36:38.000-04:00
Backpatch to all live branches to keep the code in sync.
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
@@ -378,10 +378,10 @@ initializeInput(int flags)
  *
  * max_lines: if >= 0, limit history file to that many entries.
  */
+#ifdef USE_READLINE
 static bool
 saveHistory(char *fname, int max_lines)
 {
-#ifdef USE_READLINE
 	int			errnum;
 
 	/*
@@ -446,10 +446,10 @@ saveHistory(char *fname, int max_lines)
 		psql_error("could not save history to file \"%s\": %s\n",
 				   fname, strerror(errnum));
 	}
-#endif
-
 	return false;
 }
+#endif
+
 
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -378,10 +378,10 @@ initializeInput(int flags)`
`378`	`378`	`*`
`379`	`379`	`* max_lines: if >= 0, limit history file to that many entries.`
`380`	`380`	`*/`
	`381`	`+#ifdef USE_READLINE`
`381`	`382`	`static bool`
`382`	`383`	`saveHistory(char *fname, int max_lines)`
`383`	`384`	`{`
`384`		`-#ifdef USE_READLINE`
`385`	`385`	`int errnum;`
`386`	`386`
`387`	`387`	`/*`
`@@ -446,10 +446,10 @@ saveHistory(char *fname, int max_lines)`
`446`	`446`	`psql_error("could not save history to file \"%s\": %s\n",`
`447`	`447`	`fname, strerror(errnum));`
`448`	`448`	`}`
`449`		`-#endif`
`450`		`-`
`451`	`449`	`return false;`
`452`	`450`	`}`
	`451`	`+#endif`
	`452`	`+`
`453`	`453`
`454`	`454`
`455`	`455`	`/*`