diff options
Diffstat (limited to 'src/bin/psql')
| -rw-r--r-- | src/bin/psql/mbprint.c | 4 | ||||
| -rw-r--r-- | src/bin/psql/mbprint.h | 4 | ||||
| -rw-r--r-- | src/bin/psql/print.c | 20 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/bin/psql/mbprint.c b/src/bin/psql/mbprint.c index ff9293a07a7..e5fcb387356 100644 --- a/src/bin/psql/mbprint.c +++ b/src/bin/psql/mbprint.c @@ -205,7 +205,7 @@ pg_wcswidth(const unsigned char *pwcs, size_t len, int encoding) * This MUST be kept in sync with pg_wcsformat! */ void -pg_wcssize(unsigned char *pwcs, size_t len, int encoding, +pg_wcssize(const unsigned char *pwcs, size_t len, int encoding, int *result_width, int *result_height, int *result_format_size) { int w, @@ -288,7 +288,7 @@ pg_wcssize(unsigned char *pwcs, size_t len, int encoding, * This MUST be kept in sync with pg_wcssize! */ void -pg_wcsformat(unsigned char *pwcs, size_t len, int encoding, +pg_wcsformat(const unsigned char *pwcs, size_t len, int encoding, struct lineptr * lines, int count) { int w, diff --git a/src/bin/psql/mbprint.h b/src/bin/psql/mbprint.h index f729ef045c7..83050ffcd7e 100644 --- a/src/bin/psql/mbprint.h +++ b/src/bin/psql/mbprint.h @@ -11,8 +11,8 @@ struct lineptr extern unsigned char *mbvalidate(unsigned char *pwcs, int encoding); extern int pg_wcswidth(const unsigned char *pwcs, size_t len, int encoding); -extern void pg_wcsformat(unsigned char *pwcs, size_t len, int encoding, struct lineptr * lines, int count); -extern void pg_wcssize(unsigned char *pwcs, size_t len, int encoding, +extern void pg_wcsformat(const unsigned char *pwcs, size_t len, int encoding, struct lineptr * lines, int count); +extern void pg_wcssize(const unsigned char *pwcs, size_t len, int encoding, int *width, int *height, int *format_size); #endif /* MBPRINT_H */ diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c index 28afcdda743..0d18665566f 100644 --- a/src/bin/psql/print.c +++ b/src/bin/psql/print.c @@ -559,7 +559,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout) nl_lines, bytes_required; - pg_wcssize((unsigned char *) cont->headers[i], strlen(cont->headers[i]), + pg_wcssize((const unsigned char *) cont->headers[i], strlen(cont->headers[i]), encoding, &width, &nl_lines, &bytes_required); if (width > max_width[i]) max_width[i] = width; @@ -583,7 +583,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout) nl_lines, bytes_required; - pg_wcssize((unsigned char *) *ptr, strlen(*ptr), encoding, + pg_wcssize((const unsigned char *) *ptr, strlen(*ptr), encoding, &width, &nl_lines, &bytes_required); if (width > max_width[i % col_count]) @@ -731,7 +731,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout) nl_lines, bytes_required; - pg_wcssize((unsigned char *) *ptr, strlen(*ptr), encoding, + pg_wcssize((const unsigned char *) *ptr, strlen(*ptr), encoding, &width, &nl_lines, &bytes_required); /* @@ -768,7 +768,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout) int width, height; - pg_wcssize((unsigned char *) cont->title, strlen(cont->title), + pg_wcssize((const unsigned char *) cont->title, strlen(cont->title), encoding, &width, &height, NULL); if (width >= width_total) /* Aligned */ @@ -790,7 +790,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout) PRINT_RULE_TOP, format, fout); for (i = 0; i < col_count; i++) - pg_wcsformat((unsigned char *) cont->headers[i], + pg_wcsformat((const unsigned char *) cont->headers[i], strlen(cont->headers[i]), encoding, col_lineptrs[i], max_nl_lines[i]); @@ -861,7 +861,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout) */ for (j = 0; j < col_count; j++) { - pg_wcsformat((unsigned char *) ptr[j], strlen(ptr[j]), encoding, + pg_wcsformat((const unsigned char *) ptr[j], strlen(ptr[j]), encoding, col_lineptrs[j], max_nl_lines[j]); curr_nl_line[j] = 0; } @@ -1146,7 +1146,7 @@ print_aligned_vertical(const printTableContent *cont, FILE *fout) height, fs; - pg_wcssize((unsigned char *) cont->headers[i], strlen(cont->headers[i]), + pg_wcssize((const unsigned char *) cont->headers[i], strlen(cont->headers[i]), encoding, &width, &height, &fs); if (width > hwidth) hwidth = width; @@ -1163,7 +1163,7 @@ print_aligned_vertical(const printTableContent *cont, FILE *fout) height, fs; - pg_wcssize((unsigned char *) *ptr, strlen(*ptr), encoding, + pg_wcssize((const unsigned char *) *ptr, strlen(*ptr), encoding, &width, &height, &fs); if (width > dwidth) dwidth = width; @@ -1219,11 +1219,11 @@ print_aligned_vertical(const printTableContent *cont, FILE *fout) } /* Format the header */ - pg_wcsformat((unsigned char *) cont->headers[i % cont->ncolumns], + pg_wcsformat((const unsigned char *) cont->headers[i % cont->ncolumns], strlen(cont->headers[i % cont->ncolumns]), encoding, hlineptr, hheight); /* Format the data */ - pg_wcsformat((unsigned char *) *ptr, strlen(*ptr), encoding, + pg_wcsformat((const unsigned char *) *ptr, strlen(*ptr), encoding, dlineptr, dheight); line_count = 0; |