Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit256d463

Browse files
author
Neil Conway
committed
A few cosmetic fixes and code cleanup.
1 parent9d6570b commit256d463

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

‎src/bin/psql/common.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
55
*
6-
* $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.86 2004/05/07 00:24:58 tgl Exp $
6+
* $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.87 2004/05/23 22:20:10 neilc Exp $
77
*/
88
#include"postgres_fe.h"
99
#include"common.h"
@@ -802,7 +802,8 @@ PrintQueryResults(PGresult *results)
802802
charbuf[10];
803803

804804
success= true;
805-
sprintf(buf,"%u", (unsignedint)PQoidValue(results));
805+
snprintf(buf,sizeof(buf),
806+
"%u", (unsignedint)PQoidValue(results));
806807
if (!QUIET())
807808
{
808809
if (pset.popt.topt.format==PRINT_HTML)

‎src/bin/psql/print.c‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
55
*
6-
* $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.47 2004/05/1820:18:58 momjian Exp $
6+
* $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.48 2004/05/23 22:20:10 neilc Exp $
77
*/
88
#include"postgres_fe.h"
99
#include"common.h"
@@ -1133,15 +1133,14 @@ void
11331133
printQuery(constPGresult*result,constprintQueryOpt*opt,FILE*fout)
11341134
{
11351135
intnfields;
1136+
intncells;
11361137
constchar**headers;
11371138
constchar**cells;
11381139
char**footers;
11391140
char*align;
11401141
inti;
11411142

1142-
11431143
/* extract headers */
1144-
11451144
nfields=PQnfields(result);
11461145

11471146
headers=calloc(nfields+1,sizeof(*headers));
@@ -1155,15 +1154,15 @@ printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout)
11551154
headers[i]=mbvalidate(PQfname(result,i),opt->topt.encoding);
11561155

11571156
/* set cells */
1158-
1159-
cells=calloc(nfields*PQntuples(result)+1,sizeof(*cells));
1157+
ncells=PQntuples(result)*nfields;
1158+
cells=calloc(ncells+1,sizeof(*cells));
11601159
if (!cells)
11611160
{
11621161
perror("calloc");
11631162
exit(EXIT_FAILURE);
11641163
}
11651164

1166-
for (i=0;i<nfields*PQntuples(result);i++)
1165+
for (i=0;i<ncells;i++)
11671166
{
11681167
if (PQgetisnull(result,i /nfields,i %nfields))
11691168
cells[i]=opt->nullPrint ?opt->nullPrint :"";
@@ -1185,6 +1184,11 @@ printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout)
11851184
}
11861185

11871186
footers[0]=malloc(100);
1187+
if (!footers[0])
1188+
{
1189+
perror("malloc");
1190+
exit(EXIT_FAILURE);
1191+
}
11881192
if (PQntuples(result)==1)
11891193
snprintf(footers[0],100,gettext("(1 row)"));
11901194
else
@@ -1194,7 +1198,6 @@ printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout)
11941198
footers=NULL;
11951199

11961200
/* set alignment */
1197-
11981201
align=calloc(nfields+1,sizeof(*align));
11991202
if (!align)
12001203
{
@@ -1221,13 +1224,12 @@ printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout)
12211224
}
12221225

12231226
/* call table printer */
1224-
12251227
printTable(opt->title,headers,cells,
1226-
footers ?(constchar*const*)footers : (constchar*const*) (opt->footers),
1228+
(constchar*const*)footers,
12271229
align,&opt->topt,fout);
12281230

1229-
free((void*)headers);
1230-
free((void*)cells);
1231+
free(headers);
1232+
free(cells);
12311233
if (footers)
12321234
{
12331235
free(footers[0]);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp