Fix a few more format argument warnings.

diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index dd20f3795a9a977f52c0d901eac9dec00403e328..419429bbe18784fa80d608e58f36f8d7c39aa7cc 100644 (file)
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -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 c806fbe489d4ceecc99a58f025aaa8b7431d304e..c9cd452231d7069c2b0bcfe8b3c6c4eb7921bd71 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -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 b00fb5ae95bd5239e8302699c084636c8879f3b7..8328af191153c0c2646f5730ee2e8b6b6be00f66 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -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 ae10b7768854b2946a3b05a572bce71cb979d486..4517d94de537877a69b21c4a65c13e4d5cfeb0cc 100644 (file)
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -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);
 }