Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 822f260

Browse files
committed
Fix a few more format argument warnings.
1 parent bae2116 commit 822f260

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

src/backend/commands/trigger.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.240 2008/11/09 21:24:32 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.241 2008/11/21 20:14:27 mha Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -614,7 +614,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
614614
ereport(NOTICE,
615615
(errmsg("ignoring incomplete trigger group for constraint \"%s\" %s",
616616
constr_name, buf.data),
617-
errdetail(funcdescr[funcnum])));
617+
errdetail("%s", funcdescr[funcnum])));
618618
oldContext = MemoryContextSwitchTo(TopMemoryContext);
619619
info = (OldTriggerInfo *) palloc0(sizeof(OldTriggerInfo));
620620
info->args = copyObject(stmt->args);
@@ -630,7 +630,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
630630
ereport(NOTICE,
631631
(errmsg("ignoring incomplete trigger group for constraint \"%s\" %s",
632632
constr_name, buf.data),
633-
errdetail(funcdescr[funcnum])));
633+
errdetail("%s", funcdescr[funcnum])));
634634
}
635635
else
636636
{
@@ -642,7 +642,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
642642
ereport(NOTICE,
643643
(errmsg("converting trigger group into constraint \"%s\" %s",
644644
constr_name, buf.data),
645-
errdetail(funcdescr[funcnum])));
645+
errdetail("%s", funcdescr[funcnum])));
646646
if (funcnum == 2)
647647
{
648648
/* This trigger is on the FK table */

src/backend/utils/misc/guc.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.480 2008/11/21 18:49:24 mha Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.481 2008/11/21 20:14:27 mha Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -4789,7 +4789,7 @@ set_config_option(const char *name, const char *value,
47894789
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
47904790
errmsg("invalid value for parameter \"%s\": \"%s\"",
47914791
name, value),
4792-
hintmsg ? errhint(hintmsg) : 0));
4792+
hintmsg ? errhint("%s", hintmsg) : 0));
47934793
return false;
47944794
}
47954795
if (newval < conf->min || newval > conf->max)
@@ -5053,7 +5053,7 @@ set_config_option(const char *name, const char *value,
50535053
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
50545054
errmsg("invalid value for parameter \"%s\": \"%s\"",
50555055
name, value),
5056-
hintmsg ? errhint(hintmsg) : 0));
5056+
hintmsg ? errhint("%s", hintmsg) : 0));
50575057

50585058
if (hintmsg)
50595059
pfree(hintmsg);

src/bin/pg_dump/pg_dumpall.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1994, Regents of the University of California
77
*
88
*
9-
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.107 2008/09/23 09:20:38 heikki Exp $
9+
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.108 2008/11/21 20:14:27 mha Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -308,7 +308,7 @@ main(int argc, char *argv[])
308308

309309
case 2:
310310
appendPQExpBuffer(pgdumpopts, " --lock-wait-timeout=");
311-
appendPQExpBuffer(pgdumpopts, optarg);
311+
appendPQExpBuffer(pgdumpopts, "%s", optarg);
312312
break;
313313

314314
default:

src/bin/psql/command.c

+2-2
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/command.c,v 1.197 2008/11/11 15:01:53 mha Exp $
6+
* $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.198 2008/11/21 20:14:27 mha Exp $
77
*/
88
#include "postgres_fe.h"
99
#include "command.h"
@@ -2076,7 +2076,7 @@ minimal_error_message(PGresult *res)
20762076
appendPQExpBufferStr(msg, "(not available)");
20772077
appendPQExpBufferStr(msg, "\n");
20782078

2079-
psql_error(msg->data);
2079+
psql_error("%s", msg->data);
20802080

20812081
destroyPQExpBuffer(msg);
20822082
}

0 commit comments

Comments
 (0)