|
3 | 3 | *
|
4 | 4 | * Copyright (c) 2000-2005, PostgreSQL Global Development Group
|
5 | 5 | *
|
6 |
| - * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.74 2005/09/24 17:53:27 tgl Exp $ |
| 6 | + * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.75 2005/09/26 18:09:57 momjian Exp $ |
7 | 7 | */
|
8 | 8 | #include "postgres_fe.h"
|
9 | 9 | #include "common.h"
|
@@ -399,14 +399,14 @@ print_aligned_text(const char *title, const char *const *headers,
|
399 | 399 |
|
400 | 400 | for (i = 0, ptr = cells; *ptr; ptr++, i++)
|
401 | 401 | {
|
402 |
| - int numeric_locale_len; |
| 402 | + int add_numeric_locale_len; |
403 | 403 |
|
404 | 404 | if (opt_align[i % col_count] == 'r' && opt_numeric_locale)
|
405 |
| - numeric_locale_len = additional_numeric_locale_len(*ptr); |
| 405 | + add_numeric_locale_len = additional_numeric_locale_len(*ptr); |
406 | 406 | else
|
407 |
| - numeric_locale_len = 0; |
| 407 | + add_numeric_locale_len = 0; |
408 | 408 |
|
409 |
| - tmp = pg_wcswidth(*ptr, strlen(*ptr), encoding) + numeric_locale_len; |
| 409 | + tmp = pg_wcswidth(*ptr, strlen(*ptr), encoding) + add_numeric_locale_len; |
410 | 410 | if (tmp > widths[i % col_count])
|
411 | 411 | widths[i % col_count] = tmp;
|
412 | 412 | cell_w[i] = tmp;
|
@@ -616,14 +616,14 @@ print_aligned_vertical(const char *title, const char *const *headers,
|
616 | 616 | /* find longest data cell */
|
617 | 617 | for (i = 0, ptr = cells; *ptr; ptr++, i++)
|
618 | 618 | {
|
619 |
| - int numeric_locale_len; |
| 619 | + int add_numeric_locale_len; |
620 | 620 |
|
621 | 621 | if (opt_align[i % col_count] == 'r' && opt_numeric_locale)
|
622 |
| - numeric_locale_len = additional_numeric_locale_len(*ptr); |
| 622 | + add_numeric_locale_len = additional_numeric_locale_len(*ptr); |
623 | 623 | else
|
624 |
| - numeric_locale_len = 0; |
| 624 | + add_numeric_locale_len = 0; |
625 | 625 |
|
626 |
| - tmp = pg_wcswidth(*ptr, strlen(*ptr), encoding) + numeric_locale_len; |
| 626 | + tmp = pg_wcswidth(*ptr, strlen(*ptr), encoding) + add_numeric_locale_len; |
627 | 627 | if (tmp > dwidth)
|
628 | 628 | dwidth = tmp;
|
629 | 629 | cell_w[i] = tmp;
|
|
0 commit comments