aboutsummaryrefslogtreecommitdiff
path: root/src/fe_utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/fe_utils')
-rw-r--r--src/fe_utils/mbprint.c10
-rw-r--r--src/fe_utils/print.c28
-rw-r--r--src/fe_utils/simple_list.c2
-rw-r--r--src/fe_utils/string_utils.c3
4 files changed, 22 insertions, 21 deletions
diff --git a/src/fe_utils/mbprint.c b/src/fe_utils/mbprint.c
index d186fc4c91c..364baa6a1b0 100644
--- a/src/fe_utils/mbprint.c
+++ b/src/fe_utils/mbprint.c
@@ -253,7 +253,7 @@ pg_wcssize(const unsigned char *pwcs, size_t len, int encoding,
linewidth += 4;
format_size += 4;
}
- else /* Output it as-is */
+ else /* Output it as-is */
{
linewidth += w;
format_size += 1;
@@ -264,7 +264,7 @@ pg_wcssize(const unsigned char *pwcs, size_t len, int encoding,
linewidth += 6; /* \u0000 */
format_size += 6;
}
- else /* All other chars */
+ else /* All other chars */
{
linewidth += w;
format_size += chlen;
@@ -292,7 +292,7 @@ pg_wcssize(const unsigned char *pwcs, size_t len, int encoding,
*/
void
pg_wcsformat(const unsigned char *pwcs, size_t len, int encoding,
- struct lineptr * lines, int count)
+ struct lineptr *lines, int count)
{
int w,
chlen = 0;
@@ -341,7 +341,7 @@ pg_wcsformat(const unsigned char *pwcs, size_t len, int encoding,
linewidth += 4;
ptr += 4;
}
- else /* Output it as-is */
+ else /* Output it as-is */
{
linewidth += w;
*ptr++ = *pwcs;
@@ -363,7 +363,7 @@ pg_wcsformat(const unsigned char *pwcs, size_t len, int encoding,
ptr += 6;
linewidth += 6;
}
- else /* All other chars */
+ else /* All other chars */
{
int i;
diff --git a/src/fe_utils/print.c b/src/fe_utils/print.c
index 9180b900048..4c320b215c5 100644
--- a/src/fe_utils/print.c
+++ b/src/fe_utils/print.c
@@ -370,7 +370,7 @@ print_unaligned_text(const printTableContent *cont, FILE *fout)
{
bool opt_tuples_only = cont->opt->tuples_only;
unsigned int i;
- const char *const * ptr;
+ const char *const *ptr;
bool need_recordsep = false;
if (cancel_pressed)
@@ -461,7 +461,7 @@ print_unaligned_vertical(const printTableContent *cont, FILE *fout)
{
bool opt_tuples_only = cont->opt->tuples_only;
unsigned int i;
- const char *const * ptr;
+ const char *const *ptr;
bool need_recordsep = false;
if (cancel_pressed)
@@ -606,7 +606,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout, bool is_pager)
unsigned int extra_row_output_lines = 0;
unsigned int extra_output_lines = 0;
- const char *const * ptr;
+ const char *const *ptr;
struct lineptr **col_lineptrs; /* pointers to line pointer per column */
@@ -1049,7 +1049,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout, bool is_pager)
(char *) (this_line->ptr + bytes_output[j]),
bytes_to_output);
}
- else /* Left aligned cell */
+ else /* Left aligned cell */
{
/* spaces second */
fputnbytes(fout,
@@ -1236,7 +1236,7 @@ print_aligned_vertical(const printTableContent *cont,
const printTextLineFormat *dformat = &format->lrule[PRINT_RULE_DATA];
int encoding = cont->opt->encoding;
unsigned long record = cont->opt->prior_records + 1;
- const char *const * ptr;
+ const char *const *ptr;
unsigned int i,
hwidth = 0,
dwidth = 0,
@@ -1789,7 +1789,7 @@ print_html_text(const printTableContent *cont, FILE *fout)
unsigned short opt_border = cont->opt->border;
const char *opt_table_attr = cont->opt->tableAttr;
unsigned int i;
- const char *const * ptr;
+ const char *const *ptr;
if (cancel_pressed)
return;
@@ -1879,7 +1879,7 @@ print_html_vertical(const printTableContent *cont, FILE *fout)
const char *opt_table_attr = cont->opt->tableAttr;
unsigned long record = cont->opt->prior_records + 1;
unsigned int i;
- const char *const * ptr;
+ const char *const *ptr;
if (cancel_pressed)
return;
@@ -1980,7 +1980,7 @@ print_asciidoc_text(const printTableContent *cont, FILE *fout)
bool opt_tuples_only = cont->opt->tuples_only;
unsigned short opt_border = cont->opt->border;
unsigned int i;
- const char *const * ptr;
+ const char *const *ptr;
if (cancel_pressed)
return;
@@ -2091,7 +2091,7 @@ print_asciidoc_vertical(const printTableContent *cont, FILE *fout)
unsigned short opt_border = cont->opt->border;
unsigned long record = cont->opt->prior_records + 1;
unsigned int i;
- const char *const * ptr;
+ const char *const *ptr;
if (cancel_pressed)
return;
@@ -2223,7 +2223,7 @@ print_latex_text(const printTableContent *cont, FILE *fout)
bool opt_tuples_only = cont->opt->tuples_only;
unsigned short opt_border = cont->opt->border;
unsigned int i;
- const char *const * ptr;
+ const char *const *ptr;
if (cancel_pressed)
return;
@@ -2328,7 +2328,7 @@ print_latex_longtable_text(const printTableContent *cont, FILE *fout)
const char *opt_table_attr = cont->opt->tableAttr;
const char *next_opt_table_attr_char = opt_table_attr;
const char *last_opt_table_attr_char = NULL;
- const char *const * ptr;
+ const char *const *ptr;
if (cancel_pressed)
return;
@@ -2482,7 +2482,7 @@ print_latex_vertical(const printTableContent *cont, FILE *fout)
unsigned short opt_border = cont->opt->border;
unsigned long record = cont->opt->prior_records + 1;
unsigned int i;
- const char *const * ptr;
+ const char *const *ptr;
if (cancel_pressed)
return;
@@ -2591,7 +2591,7 @@ print_troff_ms_text(const printTableContent *cont, FILE *fout)
bool opt_tuples_only = cont->opt->tuples_only;
unsigned short opt_border = cont->opt->border;
unsigned int i;
- const char *const * ptr;
+ const char *const *ptr;
if (cancel_pressed)
return;
@@ -2684,7 +2684,7 @@ print_troff_ms_vertical(const printTableContent *cont, FILE *fout)
unsigned short opt_border = cont->opt->border;
unsigned long record = cont->opt->prior_records + 1;
unsigned int i;
- const char *const * ptr;
+ const char *const *ptr;
unsigned short current_format = 0; /* 0=none, 1=header, 2=body */
if (cancel_pressed)
diff --git a/src/fe_utils/simple_list.c b/src/fe_utils/simple_list.c
index 1be8ca75980..21a2e572978 100644
--- a/src/fe_utils/simple_list.c
+++ b/src/fe_utils/simple_list.c
@@ -65,7 +65,7 @@ simple_string_list_append(SimpleStringList *list, const char *val)
SimpleStringListCell *cell;
cell = (SimpleStringListCell *)
- pg_malloc(offsetof(SimpleStringListCell, val) +strlen(val) + 1);
+ pg_malloc(offsetof(SimpleStringListCell, val) + strlen(val) + 1);
cell->next = NULL;
cell->touched = false;
diff --git a/src/fe_utils/string_utils.c b/src/fe_utils/string_utils.c
index dc84d32a097..45a08c7ee10 100644
--- a/src/fe_utils/string_utils.c
+++ b/src/fe_utils/string_utils.c
@@ -596,7 +596,7 @@ void
appendPsqlMetaConnect(PQExpBuffer buf, const char *dbname)
{
const char *s;
- bool complex;
+ bool complex;
/*
* If the name is plain ASCII characters, emit a trivial "\connect "foo"".
@@ -604,6 +604,7 @@ appendPsqlMetaConnect(PQExpBuffer buf, const char *dbname)
* general case. No database has a zero-length name.
*/
complex = false;
+
for (s = dbname; *s; s++)
{
if (*s == '\n' || *s == '\r')
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 08:05:52 +0000