Skip to content

Commit c9b2591

Browse files
bmomjianbmomjian
committed
In psql, rename trans_* variables to translate_*, for clarity.
1 parent b184575 commit c9b2591

File tree

6 files changed

+50
-50
lines changed

6 files changed

+50
-50
lines changed

‎src/bin/psql/describe.c

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* Copyright (c) 2000-2008, PostgreSQL Global Development Group
1010
*
11-
* $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.176 2008/07/12 10:44:56 petere Exp $
11+
* $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.177 2008/07/14 22:00:04 momjian Exp $
1212
*/
1313
#include "postgres_fe.h"
1414

@@ -106,7 +106,7 @@ describeAggregates(const char *pattern, bool verbose)
106106

107107
myopt.nullPrint = NULL;
108108
myopt.title = _("List of aggregate functions");
109-
myopt.trans_headers = true;
109+
myopt.translate_header = true;
110110

111111
printQuery(res, &myopt, pset.queryFout, pset.logfile);
112112

@@ -166,7 +166,7 @@ describeTablespaces(const char *pattern, bool verbose)
166166

167167
myopt.nullPrint = NULL;
168168
myopt.title = _("List of tablespaces");
169-
myopt.trans_headers = true;
169+
myopt.translate_header = true;
170170

171171
printQuery(res, &myopt, pset.queryFout, pset.logfile);
172172

@@ -278,7 +278,7 @@ describeFunctions(const char *pattern, bool verbose)
278278

279279
myopt.nullPrint = NULL;
280280
myopt.title = _("List of functions");
281-
myopt.trans_headers = true;
281+
myopt.translate_header = true;
282282

283283
printQuery(res, &myopt, pset.queryFout, pset.logfile);
284284

@@ -368,7 +368,7 @@ describeTypes(const char *pattern, bool verbose)
368368

369369
myopt.nullPrint = NULL;
370370
myopt.title = _("List of data types");
371-
myopt.trans_headers = true;
371+
myopt.translate_header = true;
372372

373373
printQuery(res, &myopt, pset.queryFout, pset.logfile);
374374

@@ -418,7 +418,7 @@ describeOperators(const char *pattern)
418418

419419
myopt.nullPrint = NULL;
420420
myopt.title = _("List of operators");
421-
myopt.trans_headers = true;
421+
myopt.translate_header = true;
422422

423423
printQuery(res, &myopt, pset.queryFout, pset.logfile);
424424

@@ -478,7 +478,7 @@ listAllDbs(bool verbose)
478478

479479
myopt.nullPrint = NULL;
480480
myopt.title = _("List of databases");
481-
myopt.trans_headers = true;
481+
myopt.translate_header = true;
482482

483483
printQuery(res, &myopt, pset.queryFout, pset.logfile);
484484

@@ -497,7 +497,7 @@ permissionsList(const char *pattern)
497497
PQExpBufferData buf;
498498
PGresult *res;
499499
printQueryOpt myopt = pset.popt;
500-
static const bool trans_columns[] = {false, false, true, false};
500+
static const bool translate_columns[] = {false, false, true, false};
501501

502502
initPQExpBuffer(&buf);
503503

@@ -546,8 +546,8 @@ permissionsList(const char *pattern)
546546
myopt.nullPrint = NULL;
547547
printfPQExpBuffer(&buf, _("Access privileges"));
548548
myopt.title = buf.data;
549-
myopt.trans_headers = true;
550-
myopt.trans_columns = trans_columns;
549+
myopt.translate_header = true;
550+
myopt.translate_columns = translate_columns;
551551

552552
printQuery(res, &myopt, pset.queryFout, pset.logfile);
553553

@@ -572,7 +572,7 @@ objectDescription(const char *pattern)
572572
PQExpBufferData buf;
573573
PGresult *res;
574574
printQueryOpt myopt = pset.popt;
575-
static const bool trans_columns[] = {false, false, true, false};
575+
static const bool translate_columns[] = {false, false, true, false};
576576

577577
initPQExpBuffer(&buf);
578578

@@ -712,8 +712,8 @@ objectDescription(const char *pattern)
712712

713713
myopt.nullPrint = NULL;
714714
myopt.title = _("Object descriptions");
715-
myopt.trans_headers = true;
716-
myopt.trans_columns = trans_columns;
715+
myopt.translate_header = true;
716+
myopt.translate_columns = translate_columns;
717717

718718
printQuery(res, &myopt, pset.queryFout, pset.logfile);
719719

@@ -1770,7 +1770,7 @@ listTables(const char *tabtypes, const char *pattern, bool verbose)
17701770
PQExpBufferData buf;
17711771
PGresult *res;
17721772
printQueryOpt myopt = pset.popt;
1773-
static const bool trans_columns[] = {false, false, true, false, false, false};
1773+
static const bool translate_columns[] = {false, false, true, false, false, false};
17741774

17751775
if (!(showTables || showIndexes || showViews || showSeq))
17761776
showTables = showViews = showSeq = true;
@@ -1867,8 +1867,8 @@ listTables(const char *tabtypes, const char *pattern, bool verbose)
18671867
{
18681868
myopt.nullPrint = NULL;
18691869
myopt.title = _("List of relations");
1870-
myopt.trans_headers = true;
1871-
myopt.trans_columns = trans_columns;
1870+
myopt.translate_header = true;
1871+
myopt.translate_columns = translate_columns;
18721872

18731873
printQuery(res, &myopt, pset.queryFout, pset.logfile);
18741874
}
@@ -1925,7 +1925,7 @@ listDomains(const char *pattern)
19251925

19261926
myopt.nullPrint = NULL;
19271927
myopt.title = _("List of domains");
1928-
myopt.trans_headers = true;
1928+
myopt.translate_header = true;
19291929

19301930
printQuery(res, &myopt, pset.queryFout, pset.logfile);
19311931

@@ -1944,7 +1944,7 @@ listConversions(const char *pattern)
19441944
PQExpBufferData buf;
19451945
PGresult *res;
19461946
printQueryOpt myopt = pset.popt;
1947-
static const bool trans_columns[] = {false, false, false, false, true};
1947+
static const bool translate_columns[] = {false, false, false, false, true};
19481948

19491949
initPQExpBuffer(&buf);
19501950

@@ -1977,8 +1977,8 @@ listConversions(const char *pattern)
19771977

19781978
myopt.nullPrint = NULL;
19791979
myopt.title = _("List of conversions");
1980-
myopt.trans_headers = true;
1981-
myopt.trans_columns = trans_columns;
1980+
myopt.translate_header = true;
1981+
myopt.translate_columns = translate_columns;
19821982

19831983
printQuery(res, &myopt, pset.queryFout, pset.logfile);
19841984

@@ -1997,7 +1997,7 @@ listCasts(const char *pattern)
19971997
PQExpBufferData buf;
19981998
PGresult *res;
19991999
printQueryOpt myopt = pset.popt;
2000-
static const bool trans_columns[] = {false, false, false, true};
2000+
static const bool translate_columns[] = {false, false, false, true};
20012001

20022002
initPQExpBuffer(&buf);
20032003
/*
@@ -2032,8 +2032,8 @@ listCasts(const char *pattern)
20322032

20332033
myopt.nullPrint = NULL;
20342034
myopt.title = _("List of casts");
2035-
myopt.trans_headers = true;
2036-
myopt.trans_columns = trans_columns;
2035+
myopt.translate_header = true;
2036+
myopt.translate_columns = translate_columns;
20372037

20382038
printQuery(res, &myopt, pset.queryFout, pset.logfile);
20392039

@@ -2085,7 +2085,7 @@ listSchemas(const char *pattern, bool verbose)
20852085

20862086
myopt.nullPrint = NULL;
20872087
myopt.title = _("List of schemas");
2088-
myopt.trans_headers = true;
2088+
myopt.translate_header = true;
20892089

20902090
printQuery(res, &myopt, pset.queryFout, pset.logfile);
20912091

@@ -2142,7 +2142,7 @@ listTSParsers(const char *pattern, bool verbose)
21422142

21432143
myopt.nullPrint = NULL;
21442144
myopt.title = _("List of text search parsers");
2145-
myopt.trans_headers = true;
2145+
myopt.translate_header = true;
21462146

21472147
printQuery(res, &myopt, pset.queryFout, pset.logfile);
21482148

@@ -2225,7 +2225,7 @@ describeOneTSParser(const char *oid, const char *nspname, const char *prsname)
22252225
PGresult *res;
22262226
char title[1024];
22272227
printQueryOpt myopt = pset.popt;
2228-
static const bool trans_columns[] = {true, false, false};
2228+
static const bool translate_columns[] = {true, false, false};
22292229

22302230
initPQExpBuffer(&buf);
22312231

@@ -2286,8 +2286,8 @@ describeOneTSParser(const char *oid, const char *nspname, const char *prsname)
22862286
myopt.title = title;
22872287
myopt.footers = NULL;
22882288
myopt.default_footer = false;
2289-
myopt.trans_headers = true;
2290-
myopt.trans_columns = trans_columns;
2289+
myopt.translate_header = true;
2290+
myopt.translate_columns = translate_columns;
22912291

22922292
printQuery(res, &myopt, pset.queryFout, pset.logfile);
22932293

@@ -2317,8 +2317,8 @@ describeOneTSParser(const char *oid, const char *nspname, const char *prsname)
23172317
myopt.title = title;
23182318
myopt.footers = NULL;
23192319
myopt.default_footer = true;
2320-
myopt.trans_headers = true;
2321-
myopt.trans_columns = NULL;
2320+
myopt.translate_header = true;
2321+
myopt.translate_columns = NULL;
23222322

23232323
printQuery(res, &myopt, pset.queryFout, pset.logfile);
23242324

@@ -2386,7 +2386,7 @@ listTSDictionaries(const char *pattern, bool verbose)
23862386

23872387
myopt.nullPrint = NULL;
23882388
myopt.title = _("List of text search dictionaries");
2389-
myopt.trans_headers = true;
2389+
myopt.translate_header = true;
23902390

23912391
printQuery(res, &myopt, pset.queryFout, pset.logfile);
23922392

@@ -2454,7 +2454,7 @@ listTSTemplates(const char *pattern, bool verbose)
24542454

24552455
myopt.nullPrint = NULL;
24562456
myopt.title = _("List of text search templates");
2457-
myopt.trans_headers = true;
2457+
myopt.translate_header = true;
24582458

24592459
printQuery(res, &myopt, pset.queryFout, pset.logfile);
24602460

@@ -2511,7 +2511,7 @@ listTSConfigs(const char *pattern, bool verbose)
25112511

25122512
myopt.nullPrint = NULL;
25132513
myopt.title = _("List of text search configurations");
2514-
myopt.trans_headers = true;
2514+
myopt.translate_header = true;
25152515

25162516
printQuery(res, &myopt, pset.queryFout, pset.logfile);
25172517

@@ -2649,7 +2649,7 @@ describeOneTSConfig(const char *oid, const char *nspname, const char *cfgname,
26492649
myopt.title = title.data;
26502650
myopt.footers = NULL;
26512651
myopt.default_footer = false;
2652-
myopt.trans_headers = true;
2652+
myopt.translate_header = true;
26532653

26542654
printQuery(res, &myopt, pset.queryFout, pset.logfile);
26552655

‎src/bin/psql/large_obj.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2000-2008, PostgreSQL Global Development Group
55
*
6-
* $PostgreSQL: pgsql/src/bin/psql/large_obj.c,v 1.50 2008/01/01 19:45:56 momjian Exp $
6+
* $PostgreSQL: pgsql/src/bin/psql/large_obj.c,v 1.51 2008/07/14 22:00:04 momjian Exp $
77
*/
88
#include "postgres_fe.h"
99
#include "large_obj.h"
@@ -293,7 +293,7 @@ do_lo_list(void)
293293
myopt.topt.tuples_only = false;
294294
myopt.nullPrint = NULL;
295295
myopt.title = _("Large objects");
296-
myopt.trans_headers = true;
296+
myopt.translate_header = true;
297297

298298
printQuery(res, &myopt, pset.queryFout, pset.logfile);
299299

‎src/bin/psql/print.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2000-2008, PostgreSQL Global Development Group
55
*
6-
* $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.108 2008/05/21 16:00:10 mha Exp $
6+
* $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.109 2008/07/14 22:00:04 momjian Exp $
77
*/
88
#include "postgres_fe.h"
99

@@ -2313,7 +2313,7 @@ printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout, FILE *f
23132313
}
23142314

23152315
printTableAddHeader(&cont, PQfname(result, i),
2316-
opt->trans_headers, align);
2316+
opt->translate_header, align);
23172317
}
23182318

23192319
/* set cells */
@@ -2329,7 +2329,7 @@ printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout, FILE *f
23292329
else
23302330
cell = PQgetvalue(result, r, c);
23312331

2332-
translate = (opt->trans_columns && opt->trans_columns[c]);
2332+
translate = (opt->translate_columns && opt->translate_columns[c]);
23332333
printTableAddCell(&cont, cell, translate);
23342334
}
23352335
}

‎src/bin/psql/print.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2000-2008, PostgreSQL Global Development Group
55
*
6-
* $PostgreSQL: pgsql/src/bin/psql/print.h,v 1.37 2008/05/12 22:59:58 alvherre Exp $
6+
* $PostgreSQL: pgsql/src/bin/psql/print.h,v 1.38 2008/07/14 22:00:04 momjian Exp $
77
*/
88
#ifndef PRINT_H
99
#define PRINT_H
@@ -90,8 +90,8 @@ typedef struct printQueryOpt
9090
char *title; /* override title */
9191
char **footers; /* override footer (default is "(xx rows)") */
9292
bool default_footer; /* print default footer if footers==NULL */
93-
bool trans_headers; /* do gettext on column headers */
94-
const bool *trans_columns; /* trans_columns[i-1] => do gettext on col i */
93+
bool translate_header; /* do gettext on column headers */
94+
const bool *translate_columns; /* translate_columns[i-1] => do gettext on col i */
9595
} printQueryOpt;
9696

9797

‎src/bin/scripts/createlang.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
66
* Portions Copyright (c) 1994, Regents of the University of California
77
*
8-
* $PostgreSQL: pgsql/src/bin/scripts/createlang.c,v 1.29 2008/01/01 19:45:56 momjian Exp $
8+
* $PostgreSQL: pgsql/src/bin/scripts/createlang.c,v 1.30 2008/07/14 22:00:04 momjian Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -125,7 +125,7 @@ main(int argc, char *argv[])
125125
if (listlangs)
126126
{
127127
printQueryOpt popt;
128-
static const bool trans_columns[] = {false, true};
128+
static const bool translate_columns[] = {false, true};
129129

130130
conn = connectDatabase(dbname, host, port, username, password,
131131
progname);
@@ -145,8 +145,8 @@ main(int argc, char *argv[])
145145
popt.topt.stop_table = true;
146146
popt.topt.encoding = PQclientEncoding(conn);
147147
popt.title = _("Procedural Languages");
148-
popt.trans_headers = true;
149-
popt.trans_columns = trans_columns;
148+
popt.translate_header = true;
149+
popt.translate_columns = translate_columns;
150150
printQuery(result, &popt, stdout, NULL);
151151

152152
PQfinish(conn);

‎src/bin/scripts/droplang.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
66
* Portions Copyright (c) 1994, Regents of the University of California
77
*
8-
* $PostgreSQL: pgsql/src/bin/scripts/droplang.c,v 1.26 2008/01/01 19:45:56 momjian Exp $
8+
* $PostgreSQL: pgsql/src/bin/scripts/droplang.c,v 1.27 2008/07/14 22:00:04 momjian Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -136,7 +136,7 @@ main(int argc, char *argv[])
136136
if (listlangs)
137137
{
138138
printQueryOpt popt;
139-
static const bool trans_columns[] = {false, true};
139+
static const bool translate_columns[] = {false, true};
140140

141141
conn = connectDatabase(dbname, host, port, username, password,
142142
progname);
@@ -156,8 +156,8 @@ main(int argc, char *argv[])
156156
popt.topt.stop_table = true;
157157
popt.topt.encoding = PQclientEncoding(conn);
158158
popt.title = _("Procedural Languages");
159-
popt.trans_headers = true;
160-
popt.trans_columns = trans_columns;
159+
popt.translate_header = true;
160+
popt.translate_columns = translate_columns;
161161
printQuery(result, &popt, stdout, NULL);
162162

163163
PQfinish(conn);

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy