Fix a few more format argument warnings.

diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 07c686c91da797f7d80ad429a36b009c5afb764d..7a08ffca5e9c0d9b34921c44153782e641f7b5ff 100644 (file)
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * 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)
        ereport(NOTICE,
        (errmsg("ignoring incomplete trigger group for constraint \"%s\" %s",
                constr_name, buf.data),
-        errdetail(funcdescr[funcnum])));
+        errdetail("%s", funcdescr[funcnum])));
        oldContext = MemoryContextSwitchTo(TopMemoryContext);
        info = (OldTriggerInfo *) palloc0(sizeof(OldTriggerInfo));
        info->args = copyObject(stmt->args);
@@ -630,7 +630,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
        ereport(NOTICE,
        (errmsg("ignoring incomplete trigger group for constraint \"%s\" %s",
                constr_name, buf.data),
-        errdetail(funcdescr[funcnum])));
+        errdetail("%s", funcdescr[funcnum])));
    }
    else
    {
@@ -642,7 +642,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
        ereport(NOTICE,
                (errmsg("converting trigger group into constraint \"%s\" %s",
                        constr_name, buf.data),
-                errdetail(funcdescr[funcnum])));
+                errdetail("%s", funcdescr[funcnum])));
        if (funcnum == 2)
        {
            /* This trigger is on the FK table */

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 40e05ed00c74377927384bd1a8ddab1b44e51999..c5e87c0b1c919520405cbfc508613259d1491229 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * 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,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
                         errmsg("invalid value for parameter \"%s\": \"%s\"",
                                name, value),
-                                hintmsg ? errhint(hintmsg) : 0));
+                                hintmsg ? errhint("%s", hintmsg) : 0));
                        return false;
                    }
                    if (newval < conf->min || newval > conf->max)
@@ -5053,7 +5053,7 @@ set_config_option(const char *name, const char *value,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
                                 errmsg("invalid value for parameter \"%s\": \"%s\"",
                                        name, value),
-                                hintmsg ? errhint(hintmsg) : 0));
+                                hintmsg ? errhint("%s", hintmsg) : 0));
 
                        if (hintmsg)
                            pfree(hintmsg);

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index ceb8cd48a0854c947492568d2ac7c8ad1eb3f9f6..889ed4eae6bb9eff6c5abfad5c04cd6b1263c2ee 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -6,7 +6,7 @@
  * 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[])
 
            case 2:
                appendPQExpBuffer(pgdumpopts, " --lock-wait-timeout=");
-               appendPQExpBuffer(pgdumpopts, optarg);
+               appendPQExpBuffer(pgdumpopts, "%s", optarg);
                break;
 
            default:

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 42bd6123694c66fe5993eea8dca9633e1a60cda1..12b2f43abc3a282d2962cc22253f01f20ef7f4f3 100644 (file)
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
  *
  * 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 "command.h"
@@ -2076,7 +2076,7 @@ minimal_error_message(PGresult *res)
        appendPQExpBufferStr(msg, "(not available)");
    appendPQExpBufferStr(msg, "\n");
 
-   psql_error(msg->data);
+   psql_error("%s", msg->data);
 
    destroyPQExpBuffer(msg);
 }