From 546cca47efa49ffdc2a0667da0784bc806d74821 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Wed, 5 Aug 2026 20:28:16 +0200 Subject: [PATCH v2 1/5] Remove useless/confusing const qualifiers The const qualifiers removed here did not qualify what is being pointed to, which is the normal use in function prototypes. Instead, they qualify the variable itself, so that it cannot be changed inside the function. That is itself not wrong, but it's not a normal style, and it seems distracting here. Reviewed-by: Chao Li Discussion: https://www.postgresql.org/message-id/flat/c855d318-4545-4dc7-b466-2e24fbf64725%40eisentraut.org --- src/bin/psql/describe.c | 14 +++++++------- src/fe_utils/print.c | 20 ++++++++++---------- src/include/fe_utils/print.h | 18 +++++++++--------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index ad9c8affb4f..afe4b323a7b 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -42,9 +42,9 @@ static bool describeOneTableDetails(const char *schemaname, const char *relationname, const char *oid, bool verbose); -static void add_tablespace_footer(printTableContent *const cont, char relkind, - Oid tablespace, const bool newline); -static void add_role_attribute(PQExpBuffer buf, const char *const str); +static void add_tablespace_footer(printTableContent *cont, char relkind, + Oid tablespace, bool newline); +static void add_role_attribute(PQExpBuffer buf, const char *str); static bool listTSParsersVerbose(const char *pattern); static bool describeOneTSParser(const char *oid, const char *nspname, const char *prsname); @@ -3719,8 +3719,8 @@ describeOneTableDetails(const char *schemaname, * footer. */ static void -add_tablespace_footer(printTableContent *const cont, char relkind, - Oid tablespace, const bool newline) +add_tablespace_footer(printTableContent *cont, char relkind, + Oid tablespace, bool newline) { /* relkinds for which we support tablespaces */ if (relkind == RELKIND_RELATION || @@ -3917,7 +3917,7 @@ describeRoles(const char *pattern, bool verbose, bool showSystem) } static void -add_role_attribute(PQExpBuffer buf, const char *const str) +add_role_attribute(PQExpBuffer buf, const char *str) { if (buf->len > 0) appendPQExpBufferStr(buf, ", "); @@ -6573,7 +6573,7 @@ listPublications(const char *pattern) */ static bool addFooterToPublicationDesc(PQExpBuffer buf, const char *footermsg, - bool as_schema, printTableContent *const cont) + bool as_schema, printTableContent *cont) { PGresult *res; int count = 0; diff --git a/src/fe_utils/print.c b/src/fe_utils/print.c index 006c026294b..76692fd2d94 100644 --- a/src/fe_utils/print.c +++ b/src/fe_utils/print.c @@ -606,7 +606,7 @@ print_unaligned_vertical(const printTableContent *cont, FILE *fout) /* draw "line" */ static void -_print_horizontal_line(const unsigned int ncolumns, const unsigned int *widths, +_print_horizontal_line(unsigned int ncolumns, const unsigned int *widths, unsigned short border, printTextRule pos, const printTextFormat *format, FILE *fout) @@ -3206,8 +3206,8 @@ ClosePager(FILE *pagerpipe) * table. */ void -printTableInit(printTableContent *const content, const printTableOpt *opt, - const char *title, const int ncolumns, const int nrows) +printTableInit(printTableContent *content, const printTableOpt *opt, + const char *title, int ncolumns, int nrows) { uint64 total_cells; @@ -3254,8 +3254,8 @@ printTableInit(printTableContent *const content, const printTableOpt *opt, * column. */ void -printTableAddHeader(printTableContent *const content, char *header, - const bool translate, const char align) +printTableAddHeader(printTableContent *content, char *header, + bool translate, char align) { #ifndef ENABLE_NLS (void) translate; /* unused parameter */ @@ -3294,8 +3294,8 @@ printTableAddHeader(printTableContent *const content, char *header, * Note: Automatic freeing of translatable strings is not supported. */ void -printTableAddCell(printTableContent *const content, char *cell, - const bool translate, const bool mustfree) +printTableAddCell(printTableContent *content, char *cell, + bool translate, bool mustfree) { uint64 total_cells; @@ -3344,7 +3344,7 @@ printTableAddCell(printTableContent *const content, char *cell, * translated as a whole. */ void -printTableAddFooter(printTableContent *const content, const char *footer) +printTableAddFooter(printTableContent *content, const char *footer) { printTableFooter *f; @@ -3369,7 +3369,7 @@ printTableAddFooter(printTableContent *const content, const char *footer) * around. */ void -printTableSetFooter(printTableContent *const content, const char *footer) +printTableSetFooter(printTableContent *content, const char *footer) { if (content->footers != NULL) { @@ -3387,7 +3387,7 @@ printTableSetFooter(printTableContent *const content, const char *footer) * printTableInit() again. */ void -printTableCleanup(printTableContent *const content) +printTableCleanup(printTableContent *content) { if (content->cellmustfree) { diff --git a/src/include/fe_utils/print.h b/src/include/fe_utils/print.h index 94f6a593619..c437707d5c9 100644 --- a/src/include/fe_utils/print.h +++ b/src/include/fe_utils/print.h @@ -212,18 +212,18 @@ extern void ClosePager(FILE *pagerpipe); extern void html_escaped_print(const char *in, FILE *fout); -extern void printTableInit(printTableContent *const content, +extern void printTableInit(printTableContent *content, const printTableOpt *opt, const char *title, - const int ncolumns, const int nrows); -extern void printTableAddHeader(printTableContent *const content, - char *header, const bool translate, const char align); -extern void printTableAddCell(printTableContent *const content, - char *cell, const bool translate, const bool mustfree); -extern void printTableAddFooter(printTableContent *const content, + int ncolumns, int nrows); +extern void printTableAddHeader(printTableContent *content, + char *header, bool translate, char align); +extern void printTableAddCell(printTableContent *content, + char *cell, bool translate, bool mustfree); +extern void printTableAddFooter(printTableContent *content, const char *footer); -extern void printTableSetFooter(printTableContent *const content, +extern void printTableSetFooter(printTableContent *content, const char *footer); -extern void printTableCleanup(printTableContent *const content); +extern void printTableCleanup(printTableContent *content); extern void printTable(const printTableContent *cont, FILE *fout, bool is_pager, FILE *flog); extern void printQuery(const PGresult *result, const printQueryOpt *opt, base-commit: 0d8e41fe1c80d1310e0eed0f66af82f60e506c69 -- 2.55.0