Harmonize more lexer function parameter names.

Make sure that function declarations use names that exactly match the
corresponding names from function definitions for several "lexer
adjacent" backend functions.  These were missed by commit aab06442.

Author: Peter Geoghegan <pg@bowt.ie>
Discussion: https://postgr.es/m/CAH2-WznJt9CMM9KJTMjJh_zbL5hD9oX44qdJ4aqZtjFi-zA3Tg@mail.gmail.com

diff --git a/src/backend/utils/adt/jsonpath_scan.l b/src/backend/utils/adt/jsonpath_scan.l
index ea824bae73e61b6a09f0832d5e47a1e4c4b93cae..948f379e76781befb6383c9714727ebda6b5e211 100644 (file)
--- a/src/backend/utils/adt/jsonpath_scan.l
+++ b/src/backend/utils/adt/jsonpath_scan.l
@@ -37,7 +37,7 @@ static char *scanbuf;
 static int scanbuflen;
 
 static void addstring(bool init, char *s, int l);
-static void addchar(bool init, char s);
+static void addchar(bool init, char c);
 static enum yytokentype checkKeyword(void);
 static void parseUnicode(char *s, int l);
 static void parseHexChar(char *s);

diff --git a/src/bin/pgbench/pgbench.h b/src/bin/pgbench/pgbench.h
index 40903bc16183788c7e85cf852ecf0a2ff5c16041..a8a0dcaa3073ed11e57bac1a2b8614a55eebb8d0 100644 (file)
--- a/src/bin/pgbench/pgbench.h
+++ b/src/bin/pgbench/pgbench.h
@@ -141,9 +141,9 @@ struct PgBenchExprList
 extern PgBenchExpr *expr_parse_result;
 
 extern int expr_yyparse(yyscan_t yyscanner);
-extern int expr_yylex(union YYSTYPE *lvalp, yyscan_t yyscanner);
-extern void expr_yyerror(yyscan_t yyscanner, const char *str) pg_attribute_noreturn();
-extern void expr_yyerror_more(yyscan_t yyscanner, const char *str,
+extern int expr_yylex(union YYSTYPE *yylval_param, yyscan_t yyscanner);
+extern void expr_yyerror(yyscan_t yyscanner, const char *message) pg_attribute_noreturn();
+extern void expr_yyerror_more(yyscan_t yyscanner, const char *message,
                              const char *more) pg_attribute_noreturn();
 extern bool expr_lex_one_word(PsqlScanState state, PQExpBuffer word_buf,
                              int *offset);

diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h
index 89f5b01b31a4a5215d92b8998d087754d566229f..c825adc4037b225b70120e117fb30e8236e50e82 100644 (file)
--- a/src/include/bootstrap/bootstrap.h
+++ b/src/include/bootstrap/bootstrap.h
@@ -57,6 +57,6 @@ extern void boot_get_type_io_data(Oid typid,
 extern int boot_yyparse(void);
 
 extern int boot_yylex(void);
-extern void boot_yyerror(const char *str) pg_attribute_noreturn();
+extern void boot_yyerror(const char *message) pg_attribute_noreturn();
 
 #endif                         /* BOOTSTRAP_H */

diff --git a/src/include/parser/scanner.h b/src/include/parser/scanner.h
index 0843481517ee381f375a2432fd63551b99ce6fa9..e775d96c7420fbb17397c4d1ed9c4388ae93023d 100644 (file)
--- a/src/include/parser/scanner.h
+++ b/src/include/parser/scanner.h
@@ -138,7 +138,7 @@ extern core_yyscan_t scanner_init(const char *str,
                                  const ScanKeywordList *keywordlist,
                                  const uint16 *keyword_tokens);
 extern void scanner_finish(core_yyscan_t yyscanner);
-extern int core_yylex(core_YYSTYPE *lvalp, YYLTYPE *llocp,
+extern int core_yylex(core_YYSTYPE *yylval_param, YYLTYPE *yylloc_param,
                       core_yyscan_t yyscanner);
 extern int scanner_errposition(int location, core_yyscan_t yyscanner);
 extern void setup_scanner_errposition_callback(ScannerCallbackState *scbstate,

diff --git a/src/include/replication/walsender_private.h b/src/include/replication/walsender_private.h
index cb4da76a896b37c4bf8e3cfdbfd2f1b19449a39f..7897c74589ec39616816ff732bf6e716e6b1819a 100644 (file)
--- a/src/include/replication/walsender_private.h
+++ b/src/include/replication/walsender_private.h
@@ -118,7 +118,7 @@ extern void WalSndSetState(WalSndState state);
  */
 extern int replication_yyparse(void);
 extern int replication_yylex(void);
-extern void replication_yyerror(const char *str) pg_attribute_noreturn();
+extern void replication_yyerror(const char *message) pg_attribute_noreturn();
 extern void replication_scanner_init(const char *str);
 extern void replication_scanner_finish(void);
 extern bool replication_scanner_is_replication_command(void);

diff --git a/src/test/isolation/isolationtester.h b/src/test/isolation/isolationtester.h
index e00bc6b816b5bb9f1792346008bec0de51e0815d..77134b03ba7f8d03b9ace8fe185911e909af5630 100644 (file)
--- a/src/test/isolation/isolationtester.h
+++ b/src/test/isolation/isolationtester.h
@@ -88,6 +88,6 @@ extern TestSpec parseresult;
 extern int spec_yyparse(void);
 
 extern int spec_yylex(void);
-extern void spec_yyerror(const char *str);
+extern void spec_yyerror(const char *message);
 
 #endif                         /* ISOLATIONTESTER_H */