Commit 822f2606 authored by Magnus Hagander's avatar Magnus Hagander

Fix a few more format argument warnings.

parent bae2116a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.240 2008/11/09 21:24:32 tgl Exp $ * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.241 2008/11/21 20:14:27 mha Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -614,7 +614,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid) ...@@ -614,7 +614,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
ereport(NOTICE, ereport(NOTICE,
(errmsg("ignoring incomplete trigger group for constraint \"%s\" %s", (errmsg("ignoring incomplete trigger group for constraint \"%s\" %s",
constr_name, buf.data), constr_name, buf.data),
errdetail(funcdescr[funcnum]))); errdetail("%s", funcdescr[funcnum])));
oldContext = MemoryContextSwitchTo(TopMemoryContext); oldContext = MemoryContextSwitchTo(TopMemoryContext);
info = (OldTriggerInfo *) palloc0(sizeof(OldTriggerInfo)); info = (OldTriggerInfo *) palloc0(sizeof(OldTriggerInfo));
info->args = copyObject(stmt->args); info->args = copyObject(stmt->args);
...@@ -630,7 +630,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid) ...@@ -630,7 +630,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
ereport(NOTICE, ereport(NOTICE,
(errmsg("ignoring incomplete trigger group for constraint \"%s\" %s", (errmsg("ignoring incomplete trigger group for constraint \"%s\" %s",
constr_name, buf.data), constr_name, buf.data),
errdetail(funcdescr[funcnum]))); errdetail("%s", funcdescr[funcnum])));
} }
else else
{ {
...@@ -642,7 +642,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid) ...@@ -642,7 +642,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
ereport(NOTICE, ereport(NOTICE,
(errmsg("converting trigger group into constraint \"%s\" %s", (errmsg("converting trigger group into constraint \"%s\" %s",
constr_name, buf.data), constr_name, buf.data),
errdetail(funcdescr[funcnum]))); errdetail("%s", funcdescr[funcnum])));
if (funcnum == 2) if (funcnum == 2)
{ {
/* This trigger is on the FK table */ /* This trigger is on the FK table */
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>. * Written by Peter Eisentraut <peter_e@gmx.net>.
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.480 2008/11/21 18:49:24 mha Exp $ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.481 2008/11/21 20:14:27 mha Exp $
* *
*-------------------------------------------------------------------- *--------------------------------------------------------------------
*/ */
...@@ -4789,7 +4789,7 @@ set_config_option(const char *name, const char *value, ...@@ -4789,7 +4789,7 @@ set_config_option(const char *name, const char *value,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("invalid value for parameter \"%s\": \"%s\"", errmsg("invalid value for parameter \"%s\": \"%s\"",
name, value), name, value),
hintmsg ? errhint(hintmsg) : 0)); hintmsg ? errhint("%s", hintmsg) : 0));
return false; return false;
} }
if (newval < conf->min || newval > conf->max) if (newval < conf->min || newval > conf->max)
...@@ -5053,7 +5053,7 @@ set_config_option(const char *name, const char *value, ...@@ -5053,7 +5053,7 @@ set_config_option(const char *name, const char *value,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("invalid value for parameter \"%s\": \"%s\"", errmsg("invalid value for parameter \"%s\": \"%s\"",
name, value), name, value),
hintmsg ? errhint(hintmsg) : 0)); hintmsg ? errhint("%s", hintmsg) : 0));
if (hintmsg) if (hintmsg)
pfree(hintmsg); pfree(hintmsg);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* *
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.107 2008/09/23 09:20:38 heikki Exp $ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.108 2008/11/21 20:14:27 mha Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -308,7 +308,7 @@ main(int argc, char *argv[]) ...@@ -308,7 +308,7 @@ main(int argc, char *argv[])
case 2: case 2:
appendPQExpBuffer(pgdumpopts, " --lock-wait-timeout="); appendPQExpBuffer(pgdumpopts, " --lock-wait-timeout=");
appendPQExpBuffer(pgdumpopts, optarg); appendPQExpBuffer(pgdumpopts, "%s", optarg);
break; break;
default: default:
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2008, PostgreSQL Global Development Group * Copyright (c) 2000-2008, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.197 2008/11/11 15:01:53 mha Exp $ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.198 2008/11/21 20:14:27 mha Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
#include "command.h" #include "command.h"
...@@ -2076,7 +2076,7 @@ minimal_error_message(PGresult *res) ...@@ -2076,7 +2076,7 @@ minimal_error_message(PGresult *res)
appendPQExpBufferStr(msg, "(not available)"); appendPQExpBufferStr(msg, "(not available)");
appendPQExpBufferStr(msg, "\n"); appendPQExpBufferStr(msg, "\n");
psql_error(msg->data); psql_error("%s", msg->data);
destroyPQExpBuffer(msg); destroyPQExpBuffer(msg);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment