Remove excess parens in ereport() calls

Cosmetic cleanup, not worth backpatching.

Discussion: https://postgr.es/m/20200129200401.GA6303@alvherre.pgsql
Reviewed-by: Tom Lane, Michael Paquier

diff --git a/contrib/adminpack/adminpack.c b/contrib/adminpack/adminpack.c
index 7b5a531e080892ed97a58c531afccce2ebb91866..29b46aea3ecd11ecef20520dfa6d4d61bf0a5546 100644 (file)
--- a/contrib/adminpack/adminpack.c
+++ b/contrib/adminpack/adminpack.c
@@ -93,7 +93,7 @@ convert_and_check_filename(text *arg, bool logAllowed)
        if (path_contains_parent_reference(filename))
            ereport(ERROR,
                    (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                    (errmsg("reference to parent directory (\"..\") not allowed"))));
+                    errmsg("reference to parent directory (\"..\") not allowed")));
 
        /*
         * Allow absolute paths if within DataDir or Log_directory, even
@@ -104,12 +104,12 @@ convert_and_check_filename(text *arg, bool logAllowed)
             !path_is_prefix_of_path(Log_directory, filename)))
            ereport(ERROR,
                    (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                    (errmsg("absolute path not allowed"))));
+                    errmsg("absolute path not allowed")));
    }
    else if (!path_is_relative_and_below_cwd(filename))
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("path must be in or below the current directory"))));
+                errmsg("path must be in or below the current directory")));
 
    return filename;
 }
@@ -124,7 +124,7 @@ requireSuperuser(void)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("only superuser may access generic file functions"))));
+                errmsg("only superuser may access generic file functions")));
 }
 
 
@@ -485,7 +485,7 @@ pg_logdir_ls(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("only superuser can list the log directory"))));
+                errmsg("only superuser can list the log directory")));
 
    return (pg_logdir_ls_internal(fcinfo));
 }
@@ -515,7 +515,7 @@ pg_logdir_ls_internal(FunctionCallInfo fcinfo)
    if (strcmp(Log_filename, "postgresql-%Y-%m-%d_%H%M%S.log") != 0)
        ereport(ERROR,
                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                (errmsg("the log_filename parameter must equal 'postgresql-%%Y-%%m-%%d_%%H%%M%%S.log'"))));
+                errmsg("the log_filename parameter must equal 'postgresql-%%Y-%%m-%%d_%%H%%M%%S.log'")));
 
    if (SRF_IS_FIRSTCALL())
    {

diff --git a/contrib/hstore_plperl/hstore_plperl.c b/contrib/hstore_plperl/hstore_plperl.c
index 1316b0500bec9bc1c3b3633a61d0c67051b71733..417b721cff9ae63545b43595d7966e835d96ca0e 100644 (file)
--- a/contrib/hstore_plperl/hstore_plperl.c
+++ b/contrib/hstore_plperl/hstore_plperl.c
@@ -116,7 +116,7 @@ plperl_to_hstore(PG_FUNCTION_ARGS)
    if (SvTYPE(in) != SVt_PVHV)
        ereport(ERROR,
                (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                (errmsg("cannot transform non-hash Perl value to hstore"))));
+                errmsg("cannot transform non-hash Perl value to hstore")));
    hv = (HV *) in;
 
    pcount = hv_iterinit(hv);

diff --git a/contrib/jsonb_plperl/jsonb_plperl.c b/contrib/jsonb_plperl/jsonb_plperl.c
index 4ae13532d13df699d8e2918b0f1f1b0b1887d9d7..ed361efbe2023c447fffd208d50b37cc68afa772 100644 (file)
--- a/contrib/jsonb_plperl/jsonb_plperl.c
+++ b/contrib/jsonb_plperl/jsonb_plperl.c
@@ -235,11 +235,11 @@ SV_to_JsonbValue(SV *in, JsonbParseState **jsonb_state, bool is_elem)
                if (isinf(nval))
                    ereport(ERROR,
                            (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-                            (errmsg("cannot convert infinity to jsonb"))));
+                            errmsg("cannot convert infinity to jsonb")));
                if (isnan(nval))
                    ereport(ERROR,
                            (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-                            (errmsg("cannot convert NaN to jsonb"))));
+                            errmsg("cannot convert NaN to jsonb")));
 
                out.type = jbvNumeric;
                out.val.numeric =
@@ -260,7 +260,7 @@ SV_to_JsonbValue(SV *in, JsonbParseState **jsonb_state, bool is_elem)
                 */
                ereport(ERROR,
                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                        (errmsg("cannot transform this Perl type to jsonb"))));
+                        errmsg("cannot transform this Perl type to jsonb")));
                return NULL;
            }
    }

diff --git a/contrib/jsonb_plpython/jsonb_plpython.c b/contrib/jsonb_plpython/jsonb_plpython.c
index b41c738ad62f5371570ed188a46145950378ab8c..b06ad9f92911ddb275cfc09990277f2c8731e5e7 100644 (file)
--- a/contrib/jsonb_plpython/jsonb_plpython.c
+++ b/contrib/jsonb_plpython/jsonb_plpython.c
@@ -380,7 +380,7 @@ PLyNumber_ToJsonbValue(PyObject *obj, JsonbValue *jbvNum)
    {
        ereport(ERROR,
                (errcode(ERRCODE_DATATYPE_MISMATCH),
-                (errmsg("could not convert value \"%s\" to jsonb", str))));
+                errmsg("could not convert value \"%s\" to jsonb", str)));
    }
    PG_END_TRY();
 
@@ -394,7 +394,7 @@ PLyNumber_ToJsonbValue(PyObject *obj, JsonbValue *jbvNum)
    if (numeric_is_nan(num))
        ereport(ERROR,
                (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-                (errmsg("cannot convert NaN to jsonb"))));
+                errmsg("cannot convert NaN to jsonb")));
 
    jbvNum->type = jbvNumeric;
    jbvNum->val.numeric = num;
@@ -446,8 +446,8 @@ PLyObject_ToJsonbValue(PyObject *obj, JsonbParseState **jsonb_state, bool is_ele
    else
        ereport(ERROR,
                (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                (errmsg("Python type \"%s\" cannot be transformed to jsonb",
-                        PLyObject_AsString((PyObject *) obj->ob_type)))));
+                errmsg("Python type \"%s\" cannot be transformed to jsonb",
+                       PLyObject_AsString((PyObject *) obj->ob_type))));
 
    /* Push result into 'jsonb_state' unless it is raw scalar value. */
    return (*jsonb_state ?

diff --git a/contrib/pageinspect/brinfuncs.c b/contrib/pageinspect/brinfuncs.c
index b1901cb03c1cfaf117ae0e99f4325ea3eb4ed5b7..fb32d74a66a98b7c35e762f55c9b12f6887b3eb2 100644 (file)
--- a/contrib/pageinspect/brinfuncs.c
+++ b/contrib/pageinspect/brinfuncs.c
@@ -52,7 +52,7 @@ brin_page_type(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use raw page functions"))));
+                errmsg("must be superuser to use raw page functions")));
 
    raw_page_size = VARSIZE(raw_page) - VARHDRSZ;
 
@@ -141,7 +141,7 @@ brin_page_items(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use raw page functions"))));
+                errmsg("must be superuser to use raw page functions")));
 
    /* check to see if caller supports us returning a tuplestore */
    if (rsinfo == NULL || !IsA(rsinfo, ReturnSetInfo))
@@ -336,7 +336,7 @@ brin_metapage_info(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use raw page functions"))));
+                errmsg("must be superuser to use raw page functions")));
 
    page = verify_brin_page(raw_page, BRIN_PAGETYPE_META, "metapage");
 
@@ -374,7 +374,7 @@ brin_revmap_data(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use raw page functions"))));
+                errmsg("must be superuser to use raw page functions")));
 
    if (SRF_IS_FIRSTCALL())
    {

diff --git a/contrib/pageinspect/btreefuncs.c b/contrib/pageinspect/btreefuncs.c
index 78cdc69ec7edaa034d5ecaf626cd1fde2afcd7d0..564c818558f451a55bb472e238f0827044bb7830 100644 (file)
--- a/contrib/pageinspect/btreefuncs.c
+++ b/contrib/pageinspect/btreefuncs.c
@@ -174,7 +174,7 @@ bt_page_stats(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use pageinspect functions"))));
+                errmsg("must be superuser to use pageinspect functions")));
 
    relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
    rel = relation_openrv(relrv, AccessShareLock);
@@ -318,7 +318,7 @@ bt_page_items(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use pageinspect functions"))));
+                errmsg("must be superuser to use pageinspect functions")));
 
    if (SRF_IS_FIRSTCALL())
    {
@@ -428,7 +428,7 @@ bt_page_items_bytea(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use raw page functions"))));
+                errmsg("must be superuser to use raw page functions")));
 
    if (SRF_IS_FIRSTCALL())
    {
@@ -518,7 +518,7 @@ bt_metap(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use pageinspect functions"))));
+                errmsg("must be superuser to use pageinspect functions")));
 
    relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
    rel = relation_openrv(relrv, AccessShareLock);

diff --git a/contrib/pageinspect/fsmfuncs.c b/contrib/pageinspect/fsmfuncs.c
index e830be8060d7410ffa5bd6ce9bc7cee35ed1bb5b..099acbb2fe4b068b1b37b8ff4d1e2a81925cb523 100644 (file)
--- a/contrib/pageinspect/fsmfuncs.c
+++ b/contrib/pageinspect/fsmfuncs.c
@@ -42,7 +42,7 @@ fsm_page_contents(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use raw page functions"))));
+                errmsg("must be superuser to use raw page functions")));
 
    fsmpage = (FSMPage) PageGetContents(VARDATA(raw_page));
 

diff --git a/contrib/pageinspect/ginfuncs.c b/contrib/pageinspect/ginfuncs.c
index 4b623fbf51442a8661559d0b6d96108e0dac8d78..9b1d41c510ee2229fe44fecbe87e34d6d417e4fb 100644 (file)
--- a/contrib/pageinspect/ginfuncs.c
+++ b/contrib/pageinspect/ginfuncs.c
@@ -45,7 +45,7 @@ gin_metapage_info(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use raw page functions"))));
+                errmsg("must be superuser to use raw page functions")));
 
    page = get_page_from_raw(raw_page);
 
@@ -103,7 +103,7 @@ gin_page_opaque_info(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use raw page functions"))));
+                errmsg("must be superuser to use raw page functions")));
 
    page = get_page_from_raw(raw_page);
 
@@ -169,7 +169,7 @@ gin_leafpage_items(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use raw page functions"))));
+                errmsg("must be superuser to use raw page functions")));
 
    if (SRF_IS_FIRSTCALL())
    {

diff --git a/contrib/pageinspect/hashfuncs.c b/contrib/pageinspect/hashfuncs.c
index 5bbd230742d02d31f60c254eb9c8043be1b6427c..effc80fbd3fbe3fa31c4c1b9139d10373b640786 100644 (file)
--- a/contrib/pageinspect/hashfuncs.c
+++ b/contrib/pageinspect/hashfuncs.c
@@ -195,7 +195,7 @@ hash_page_type(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use raw page functions"))));
+                errmsg("must be superuser to use raw page functions")));
 
    page = verify_hash_page(raw_page, 0);
 
@@ -243,7 +243,7 @@ hash_page_stats(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use raw page functions"))));
+                errmsg("must be superuser to use raw page functions")));
 
    page = verify_hash_page(raw_page, LH_BUCKET_PAGE | LH_OVERFLOW_PAGE);
 
@@ -310,7 +310,7 @@ hash_page_items(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use raw page functions"))));
+                errmsg("must be superuser to use raw page functions")));
 
    if (SRF_IS_FIRSTCALL())
    {
@@ -415,7 +415,7 @@ hash_bitmap_info(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use raw page functions"))));
+                errmsg("must be superuser to use raw page functions")));
 
    indexRel = index_open(indexRelid, AccessShareLock);
 
@@ -526,7 +526,7 @@ hash_metapage_info(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use raw page functions"))));
+                errmsg("must be superuser to use raw page functions")));
 
    page = verify_hash_page(raw_page, LH_META_PAGE);
 

diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c
index aa7e4b9fef8359df84e87aed1d30deaea6c84973..61fe4359a0ccfbb7891d03f2e11b4b71a2d28dad 100644 (file)
--- a/contrib/pageinspect/heapfuncs.c
+++ b/contrib/pageinspect/heapfuncs.c
@@ -135,7 +135,7 @@ heap_page_items(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use raw page functions"))));
+                errmsg("must be superuser to use raw page functions")));
 
    raw_page_size = VARSIZE(raw_page) - VARHDRSZ;
 

diff --git a/contrib/pageinspect/rawpage.c b/contrib/pageinspect/rawpage.c
index a7b0d177d272e24d631ab2fec1832d30fcec44bd..c0181506a5d0b4deb1e34c92ebc0b63be0d0ee1f 100644 (file)
--- a/contrib/pageinspect/rawpage.c
+++ b/contrib/pageinspect/rawpage.c
@@ -102,7 +102,7 @@ get_raw_page_internal(text *relname, ForkNumber forknum, BlockNumber blkno)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use raw page functions"))));
+                errmsg("must be superuser to use raw page functions")));
 
    relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
    rel = relation_openrv(relrv, AccessShareLock);
@@ -233,7 +233,7 @@ page_header(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use raw page functions"))));
+                errmsg("must be superuser to use raw page functions")));
 
    raw_page_size = VARSIZE(raw_page) - VARHDRSZ;
 
@@ -305,7 +305,7 @@ page_checksum(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use raw page functions"))));
+                errmsg("must be superuser to use raw page functions")));
 
    raw_page_size = VARSIZE(raw_page) - VARHDRSZ;
 

diff --git a/contrib/pg_prewarm/pg_prewarm.c b/contrib/pg_prewarm/pg_prewarm.c
index b5ebac8f9718ffa2e6edf6326e5f2b5e8ea6dfc3..33e2d28b2767ed2c5ea200d641eba1eebb38851b 100644 (file)
--- a/contrib/pg_prewarm/pg_prewarm.c
+++ b/contrib/pg_prewarm/pg_prewarm.c
@@ -77,7 +77,7 @@ pg_prewarm(PG_FUNCTION_ARGS)
    if (PG_ARGISNULL(1))
        ereport(ERROR,
                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                (errmsg("prewarm type cannot be null"))));
+                errmsg("prewarm type cannot be null")));
    type = PG_GETARG_TEXT_PP(1);
    ttype = text_to_cstring(type);
    if (strcmp(ttype, "prefetch") == 0)
@@ -97,7 +97,7 @@ pg_prewarm(PG_FUNCTION_ARGS)
    if (PG_ARGISNULL(2))
        ereport(ERROR,
                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                (errmsg("relation fork cannot be null"))));
+                errmsg("relation fork cannot be null")));
    forkName = PG_GETARG_TEXT_PP(2);
    forkString = text_to_cstring(forkName);
    forkNumber = forkname_to_number(forkString);

diff --git a/contrib/pgstattuple/pgstatapprox.c b/contrib/pgstattuple/pgstatapprox.c
index 672dbf2bb7a6f53cb0a87cadf839d148730e6f2f..96d837485fa31313ef6b350bae5ed4ce4ff46e85 100644 (file)
--- a/contrib/pgstattuple/pgstatapprox.c
+++ b/contrib/pgstattuple/pgstatapprox.c
@@ -228,7 +228,7 @@ pgstattuple_approx(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use pgstattuple functions"))));
+                errmsg("must be superuser to use pgstattuple functions")));
 
    PG_RETURN_DATUM(pgstattuple_approx_internal(relid, fcinfo));
 }

diff --git a/contrib/pgstattuple/pgstatindex.c b/contrib/pgstattuple/pgstatindex.c
index 4bae176e09ebd55ea9574c7e5497a2be6b3d8768..b1ce0d77d7378cb632ec6728ce93bb6408358b55 100644 (file)
--- a/contrib/pgstattuple/pgstatindex.c
+++ b/contrib/pgstattuple/pgstatindex.c
@@ -151,7 +151,7 @@ pgstatindex(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use pgstattuple functions"))));
+                errmsg("must be superuser to use pgstattuple functions")));
 
    relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
    rel = relation_openrv(relrv, AccessShareLock);
@@ -193,7 +193,7 @@ pgstatindexbyid(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use pgstattuple functions"))));
+                errmsg("must be superuser to use pgstattuple functions")));
 
    rel = relation_open(relid, AccessShareLock);
 
@@ -386,7 +386,7 @@ pg_relpages(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use pgstattuple functions"))));
+                errmsg("must be superuser to use pgstattuple functions")));
 
    relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
    rel = relation_openrv(relrv, AccessShareLock);
@@ -438,7 +438,7 @@ pg_relpagesbyid(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use pgstattuple functions"))));
+                errmsg("must be superuser to use pgstattuple functions")));
 
    rel = relation_open(relid, AccessShareLock);
 
@@ -492,7 +492,7 @@ pgstatginindex(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use pgstattuple functions"))));
+                errmsg("must be superuser to use pgstattuple functions")));
 
    PG_RETURN_DATUM(pgstatginindex_internal(relid, fcinfo));
 }

diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c
index 70af43ebd5a6bdf67c109b4e1d7774e1fbc15f51..69179d4104d5cbf9d2b4de0966264421225ba893 100644 (file)
--- a/contrib/pgstattuple/pgstattuple.c
+++ b/contrib/pgstattuple/pgstattuple.c
@@ -173,7 +173,7 @@ pgstattuple(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use pgstattuple functions"))));
+                errmsg("must be superuser to use pgstattuple functions")));
 
    /* open relation */
    relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
@@ -213,7 +213,7 @@ pgstattuplebyid(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to use pgstattuple functions"))));
+                errmsg("must be superuser to use pgstattuple functions")));
 
    /* open relation */
    rel = relation_open(relid, AccessShareLock);

diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c
index d4e21f90a8ebc0df950cb51821fe37e71d90ebc7..20316539b6f139db3d07cc5611770bf151f7d67a 100644 (file)
--- a/src/backend/access/transam/xlogfuncs.c
+++ b/src/backend/access/transam/xlogfuncs.c
@@ -298,8 +298,8 @@ pg_create_restore_point(PG_FUNCTION_ARGS)
    if (RecoveryInProgress())
        ereport(ERROR,
                (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-                (errmsg("recovery is in progress"),
-                 errhint("WAL control functions cannot be executed during recovery."))));
+                errmsg("recovery is in progress"),
+                errhint("WAL control functions cannot be executed during recovery.")));
 
    if (!XLogIsNeeded())
        ereport(ERROR,

diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c
index 4dda38fa3045cdfd0a790d87603c82ed0487bf99..fca85ba2c17fdb5633ac47c679bf4ec7ba9e6326 100644 (file)
--- a/src/backend/commands/alter.c
+++ b/src/backend/commands/alter.c
@@ -212,8 +212,8 @@ AlterObjectRename_internal(Relation rel, Oid objectId, const char *new_name)
        if (Anum_owner <= 0)
            ereport(ERROR,
                    (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                    (errmsg("must be superuser to rename %s",
-                            getObjectDescriptionOids(classId, objectId)))));
+                    errmsg("must be superuser to rename %s",
+                           getObjectDescriptionOids(classId, objectId))));
 
        /* Otherwise, must be owner of the existing object */
        datum = heap_getattr(oldtup, Anum_owner,
@@ -715,8 +715,8 @@ AlterObjectNamespace_internal(Relation rel, Oid objid, Oid nspOid)
        if (Anum_owner <= 0)
            ereport(ERROR,
                    (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                    (errmsg("must be superuser to set schema of %s",
-                            getObjectDescriptionOids(classId, objid)))));
+                    errmsg("must be superuser to set schema of %s",
+                           getObjectDescriptionOids(classId, objid))));
 
        /* Otherwise, must be owner of the existing object */
        owner = heap_getattr(tup, Anum_owner, RelationGetDescr(rel), &isnull);

diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c
index 34c75e8b56f332d7bc3de0ec696777ce0db2e0a3..85f726ae062e70c1bcdc11d4ab844687fae7946a 100644 (file)
--- a/src/backend/commands/collationcmds.c
+++ b/src/backend/commands/collationcmds.c
@@ -527,7 +527,7 @@ pg_import_system_collations(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to import system collations"))));
+                errmsg("must be superuser to import system collations")));
 
    /* Load collations known to libc, using "locale -a" to enumerate them */
 #ifdef READ_LOCALE_A_OUTPUT

diff --git a/src/backend/commands/createas.c b/src/backend/commands/createas.c
index 9f387b5f5f1fd693ce86853590692c1171a9ca9f..cc02cf824ed9795775babbb09887ed2e27034d4d 100644 (file)
--- a/src/backend/commands/createas.c
+++ b/src/backend/commands/createas.c
@@ -537,7 +537,7 @@ intorel_startup(DestReceiver *self, int operation, TupleDesc typeinfo)
    if (check_enable_rls(intoRelationAddr.objectId, InvalidOid, false) == RLS_ENABLED)
        ereport(ERROR,
                (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                (errmsg("policies not yet implemented for this command"))));
+                errmsg("policies not yet implemented for this command")));
 
    /*
     * Tentatively mark the target as populated, if it's a matview and we're

diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 0f40c9ee27b536513d77afb8d4c3ee1378c95dc2..540044b2d68d5ff37140d38748428959e86b9291 100644 (file)
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -286,8 +286,8 @@ interpret_function_parameter_list(ParseState *pstate,
            if (fp->mode == FUNC_PARAM_OUT)
                ereport(ERROR,
                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                        (errmsg("procedures cannot have OUT arguments"),
-                         errhint("INOUT arguments are permitted."))));
+                        errmsg("procedures cannot have OUT arguments"),
+                        errhint("INOUT arguments are permitted.")));
        }
 
        /* handle input parameters */

diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index f96cb42adcd71639c2cd5022650bcb1ff4e03f51..eb4d22cc2a8987179fce11965661ce95b135c3d3 100644 (file)
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -158,7 +158,7 @@ CreatePublication(CreatePublicationStmt *stmt)
    if (stmt->for_all_tables && !superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to create FOR ALL TABLES publication"))));
+                errmsg("must be superuser to create FOR ALL TABLES publication")));
 
    rel = table_open(PublicationRelationId, RowExclusiveLock);
 

diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 9bfe142adaa02f7966657dc752d445625dc5d196..119a9ce76ffe6e37997b699f89fb62db3716d374 100644 (file)
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -347,7 +347,7 @@ CreateSubscription(CreateSubscriptionStmt *stmt, bool isTopLevel)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to create subscriptions"))));
+                errmsg("must be superuser to create subscriptions")));
 
    /*
     * If built with appropriate switch, whine when regression-testing

diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index f37065984233d20d92136dc0b1c9333863cc0418..c47fdfc9e55dd3c2106fee5f71868564e6f32c57 100644 (file)
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -1523,8 +1523,8 @@ AddRoleMems(const char *rolename, Oid roleid,
        if (is_member_of_role_nosuper(roleid, memberid))
            ereport(ERROR,
                    (errcode(ERRCODE_INVALID_GRANT_OPERATION),
-                    (errmsg("role \"%s\" is a member of role \"%s\"",
-                            rolename, get_rolespec_name(memberRole)))));
+                    errmsg("role \"%s\" is a member of role \"%s\"",
+                           rolename, get_rolespec_name(memberRole))));
 
        /*
         * Check if entry for this role/member already exists; if so, give

diff --git a/src/backend/libpq/auth-scram.c b/src/backend/libpq/auth-scram.c
index d2e94d76c5fc52f79dc19a9253ae4ce3a1f5f077..5e5119e8ea741f8de58f277eeeac5852847ae0a6 100644 (file)
--- a/src/backend/libpq/auth-scram.c
+++ b/src/backend/libpq/auth-scram.c
@@ -997,8 +997,8 @@ read_client_first_message(scram_state *state, const char *input)
            if (strcmp(channel_binding_type, "tls-server-end-point") != 0)
                ereport(ERROR,
                        (errcode(ERRCODE_PROTOCOL_VIOLATION),
-                        (errmsg("unsupported SCRAM channel-binding type \"%s\"",
-                                sanitize_str(channel_binding_type)))));
+                        errmsg("unsupported SCRAM channel-binding type \"%s\"",
+                               sanitize_str(channel_binding_type))));
            break;
        default:
            ereport(ERROR,
@@ -1282,7 +1282,7 @@ read_client_final_message(scram_state *state, const char *input)
        if (strcmp(channel_binding, b64_message) != 0)
            ereport(ERROR,
                    (errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
-                    (errmsg("SCRAM channel binding check failed"))));
+                    errmsg("SCRAM channel binding check failed")));
 #else
        /* shouldn't happen, because we checked this earlier already */
        elog(ERROR, "channel binding not supported by this build");
@@ -1300,7 +1300,7 @@ read_client_final_message(scram_state *state, const char *input)
            !(strcmp(channel_binding, "eSws") == 0 && state->cbind_flag == 'y'))
            ereport(ERROR,
                    (errcode(ERRCODE_PROTOCOL_VIOLATION),
-                    (errmsg("unexpected SCRAM channel-binding attribute in client-final-message"))));
+                    errmsg("unexpected SCRAM channel-binding attribute in client-final-message")));
    }
 
    state->client_final_nonce = read_attr_value(&p, 'r');

diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c
index 987ab660cbe504371e14bee94e316b4738b03cfc..18d3fff068be1258317e01837e0187a486ea1af2 100644 (file)
--- a/src/backend/libpq/be-secure-openssl.c
+++ b/src/backend/libpq/be-secure-openssl.c
@@ -999,7 +999,7 @@ initialize_dh(SSL_CTX *context, bool isServerStart)
    {
        ereport(isServerStart ? FATAL : LOG,
                (errcode(ERRCODE_CONFIG_FILE_ERROR),
-                (errmsg("DH: could not load DH parameters"))));
+                errmsg("DH: could not load DH parameters")));
        return false;
    }
 
@@ -1007,8 +1007,8 @@ initialize_dh(SSL_CTX *context, bool isServerStart)
    {
        ereport(isServerStart ? FATAL : LOG,
                (errcode(ERRCODE_CONFIG_FILE_ERROR),
-                (errmsg("DH: could not set DH parameters: %s",
-                        SSLerrmessage(ERR_get_error())))));
+                errmsg("DH: could not set DH parameters: %s",
+                       SSLerrmessage(ERR_get_error()))));
        DH_free(dh);
        return false;
    }

diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c
index cc4c7b5b758d1a56f823ac85882b65304f436ebe..b2b69a72079f74a5429feffa59a54ff85365bc2b 100644 (file)
--- a/src/backend/postmaster/syslogger.c
+++ b/src/backend/postmaster/syslogger.c
@@ -569,7 +569,7 @@ SysLogger_Start(void)
        if (pipe(syslogPipe) < 0)
            ereport(FATAL,
                    (errcode_for_socket_access(),
-                    (errmsg("could not create pipe for syslog: %m"))));
+                    errmsg("could not create pipe for syslog: %m")));
    }
 #else
    if (!syslogPipe[0])
@@ -583,7 +583,7 @@ SysLogger_Start(void)
        if (!CreatePipe(&syslogPipe[0], &syslogPipe[1], &sa, 32768))
            ereport(FATAL,
                    (errcode_for_file_access(),
-                    (errmsg("could not create pipe for syslog: %m"))));
+                    errmsg("could not create pipe for syslog: %m")));
    }
 #endif
 

diff --git a/src/backend/replication/logical/logical.c b/src/backend/replication/logical/logical.c
index cf9320061882da79c5e3debb2504b6faaaff0fb0..e3da7d36250330ee842126c7391be41205cf6a35 100644 (file)
--- a/src/backend/replication/logical/logical.c
+++ b/src/backend/replication/logical/logical.c
@@ -390,13 +390,13 @@ CreateDecodingContext(XLogRecPtr start_lsn,
    if (SlotIsPhysical(slot))
        ereport(ERROR,
                (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-                (errmsg("cannot use physical replication slot for logical decoding"))));
+                errmsg("cannot use physical replication slot for logical decoding")));
 
    if (slot->data.database != MyDatabaseId)
        ereport(ERROR,
                (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-                (errmsg("replication slot \"%s\" was not created in this database",
-                        NameStr(slot->data.name)))));
+                errmsg("replication slot \"%s\" was not created in this database",
+                       NameStr(slot->data.name))));
 
    if (start_lsn == InvalidXLogRecPtr)
    {

diff --git a/src/backend/replication/logical/logicalfuncs.c b/src/backend/replication/logical/logicalfuncs.c
index 25b89e5616c1e13d456fc8d417db8b74e1a02e0d..8095ae4cb1e68f464efd3b891c0a8d5d1222324f 100644 (file)
--- a/src/backend/replication/logical/logicalfuncs.c
+++ b/src/backend/replication/logical/logicalfuncs.c
@@ -103,7 +103,7 @@ check_permissions(void)
    if (!superuser() && !has_rolreplication(GetUserId()))
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser or replication role to use replication slots"))));
+                errmsg("must be superuser or replication role to use replication slots")));
 }
 
 int

diff --git a/src/backend/replication/repl_gram.y b/src/backend/replication/repl_gram.y
index 2d96567409ffb942ded49da65fae660908eccb10..14fcd532218bb789bce7da0e586ecc9170cbde5e 100644 (file)
--- a/src/backend/replication/repl_gram.y
+++ b/src/backend/replication/repl_gram.y
@@ -333,7 +333,7 @@ timeline_history:
                    if ($2 <= 0)
                        ereport(ERROR,
                                (errcode(ERRCODE_SYNTAX_ERROR),
-                                (errmsg("invalid timeline %u", $2))));
+                                errmsg("invalid timeline %u", $2)));
 
                    cmd = makeNode(TimeLineHistoryCmd);
                    cmd->timeline = $2;
@@ -365,7 +365,7 @@ opt_timeline:
                    if ($2 <= 0)
                        ereport(ERROR,
                                (errcode(ERRCODE_SYNTAX_ERROR),
-                                (errmsg("invalid timeline %u", $2))));
+                                errmsg("invalid timeline %u", $2)));
                    $$ = $2;
                }
                | /* EMPTY */           { $$ = 0; }

diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c
index 976f6479a9eaa4b56068a304f6fb4e5684874bc9..1cec53d748426ac00a3a184f53a8623c2cae7e8d 100644 (file)
--- a/src/backend/replication/slot.c
+++ b/src/backend/replication/slot.c
@@ -979,7 +979,7 @@ CheckSlotRequirements(void)
    if (max_replication_slots == 0)
        ereport(ERROR,
                (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-                (errmsg("replication slots can only be used if max_replication_slots > 0"))));
+                errmsg("replication slots can only be used if max_replication_slots > 0")));
 
    if (wal_level < WAL_LEVEL_REPLICA)
        ereport(ERROR,

diff --git a/src/backend/replication/slotfuncs.c b/src/backend/replication/slotfuncs.c
index e4c4401b68602d5b4eee9dbeb295d6b5fb5c4071..2c9d5de6d9037a9dc1f1682ff143084befc5f3f5 100644 (file)
--- a/src/backend/replication/slotfuncs.c
+++ b/src/backend/replication/slotfuncs.c
@@ -31,7 +31,7 @@ check_permissions(void)
    if (!superuser() && !has_rolreplication(GetUserId()))
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser or replication role to use replication slots"))));
+                errmsg("must be superuser or replication role to use replication slots")));
 }
 
 /*
@@ -669,7 +669,7 @@ copy_replication_slot(FunctionCallInfo fcinfo, bool logical_slot)
        Assert(!logical_slot);
        ereport(ERROR,
                (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                (errmsg("cannot copy a replication slot that doesn't reserve WAL"))));
+                errmsg("cannot copy a replication slot that doesn't reserve WAL")));
    }
 
    /* Overwrite params from optional arguments */

diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
index 0c65f1660b2e70b3652a15161ff3757c0796d172..abb533b9d036e5a53baf51d172ffd58ae3d62672 100644 (file)
--- a/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@ -563,7 +563,7 @@ StartReplication(StartReplicationCmd *cmd)
        if (SlotIsLogical(MyReplicationSlot))
            ereport(ERROR,
                    (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-                    (errmsg("cannot use a logical replication slot for physical replication"))));
+                    errmsg("cannot use a logical replication slot for physical replication")));
    }
 
    /*
@@ -1499,8 +1499,8 @@ exec_replication_command(const char *cmd_string)
    if (parse_rc != 0)
        ereport(ERROR,
                (errcode(ERRCODE_SYNTAX_ERROR),
-                (errmsg_internal("replication command parser returned %d",
-                                 parse_rc))));
+                errmsg_internal("replication command parser returned %d",
+                                parse_rc)));
 
    cmd_node = replication_parse_result;
 

diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index c3adb2e6c0ad8a63800a30dcd3e5f277d3187753..4a5b26c23dc64a5faedf14ded085041a15a85b49 100644 (file)
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -3046,14 +3046,14 @@ TerminateOtherDBBackends(Oid databaseId)
                if (superuser_arg(proc->roleId) && !superuser())
                    ereport(ERROR,
                            (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                            (errmsg("must be a superuser to terminate superuser process"))));
+                            errmsg("must be a superuser to terminate superuser process")));
 
                /* Users can signal backends they have role membership in. */
                if (!has_privs_of_role(GetUserId(), proc->roleId) &&
                    !has_privs_of_role(GetUserId(), DEFAULT_ROLE_SIGNAL_BACKENDID))
                    ereport(ERROR,
                            (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                            (errmsg("must be a member of the role whose process is being terminated or member of pg_signal_backend"))));
+                            errmsg("must be a member of the role whose process is being terminated or member of pg_signal_backend")));
            }
        }
 

diff --git a/src/backend/storage/ipc/signalfuncs.c b/src/backend/storage/ipc/signalfuncs.c
index 7fb6ced14b62a8d766eee89a107458b2e6826301..9dd5a27204568209cd6ee42f3cd60e4e67696232 100644 (file)
--- a/src/backend/storage/ipc/signalfuncs.c
+++ b/src/backend/storage/ipc/signalfuncs.c
@@ -115,12 +115,12 @@ pg_cancel_backend(PG_FUNCTION_ARGS)
    if (r == SIGNAL_BACKEND_NOSUPERUSER)
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be a superuser to cancel superuser query"))));
+                errmsg("must be a superuser to cancel superuser query")));
 
    if (r == SIGNAL_BACKEND_NOPERMISSION)
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be a member of the role whose query is being canceled or member of pg_signal_backend"))));
+                errmsg("must be a member of the role whose query is being canceled or member of pg_signal_backend")));
 
    PG_RETURN_BOOL(r == SIGNAL_BACKEND_SUCCESS);
 }
@@ -139,12 +139,12 @@ pg_terminate_backend(PG_FUNCTION_ARGS)
    if (r == SIGNAL_BACKEND_NOSUPERUSER)
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be a superuser to terminate superuser process"))));
+                errmsg("must be a superuser to terminate superuser process")));
 
    if (r == SIGNAL_BACKEND_NOPERMISSION)
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be a member of the role whose process is being terminated or member of pg_signal_backend"))));
+                errmsg("must be a member of the role whose process is being terminated or member of pg_signal_backend")));
 
    PG_RETURN_BOOL(r == SIGNAL_BACKEND_SUCCESS);
 }
@@ -180,10 +180,10 @@ pg_rotate_logfile(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to rotate log files with adminpack 1.0"),
+                errmsg("must be superuser to rotate log files with adminpack 1.0"),
        /* translator: %s is a SQL function name */
-                 errhint("Consider using %s, which is part of core, instead.",
-                         "pg_logfile_rotate()"))));
+                errhint("Consider using %s, which is part of core, instead.",
+                        "pg_logfile_rotate()")));
 
    if (!Logging_collector)
    {

diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c
index 0d75928e7f3481954ec72d56e4ca83ee29146c41..3741b87486d0e8cf0942d61d2d8750a781db06da 100644 (file)
--- a/src/backend/utils/adt/genfile.c
+++ b/src/backend/utils/adt/genfile.c
@@ -78,7 +78,7 @@ convert_and_check_filename(text *arg)
        if (path_contains_parent_reference(filename))
            ereport(ERROR,
                    (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                    (errmsg("reference to parent directory (\"..\") not allowed"))));
+                    errmsg("reference to parent directory (\"..\") not allowed")));
 
        /*
         * Allow absolute paths if within DataDir or Log_directory, even
@@ -89,12 +89,12 @@ convert_and_check_filename(text *arg)
             !path_is_prefix_of_path(Log_directory, filename)))
            ereport(ERROR,
                    (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                    (errmsg("absolute path not allowed"))));
+                    errmsg("absolute path not allowed")));
    }
    else if (!path_is_relative_and_below_cwd(filename))
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("path must be in or below the current directory"))));
+                errmsg("path must be in or below the current directory")));
 
    return filename;
 }
@@ -218,10 +218,10 @@ pg_read_file(PG_FUNCTION_ARGS)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to read files with adminpack 1.0"),
+                errmsg("must be superuser to read files with adminpack 1.0"),
        /* translator: %s is a SQL function name */
-                 errhint("Consider using %s, which is part of core, instead.",
-                         "pg_file_read()"))));
+                errhint("Consider using %s, which is part of core, instead.",
+                        "pg_file_read()")));
 
    /* handle optional arguments */
    if (PG_NARGS() >= 3)

diff --git a/src/backend/utils/adt/pg_upgrade_support.c b/src/backend/utils/adt/pg_upgrade_support.c
index 8b26e1a93df192c83ad3134d6dfd16bb4d088d3a..0d9e55cdcf4b0c22e7bc73f336e08607d5a63a50 100644 (file)
--- a/src/backend/utils/adt/pg_upgrade_support.c
+++ b/src/backend/utils/adt/pg_upgrade_support.c
@@ -26,7 +26,7 @@ do {                                                          \
    if (!IsBinaryUpgrade)                                       \
        ereport(ERROR,                                          \
                (errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),    \
-                (errmsg("function can only be called when server is in binary upgrade mode")))); \
+                errmsg("function can only be called when server is in binary upgrade mode"))); \
 } while (0)
 
 Datum

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index cacbe904db7dea349757e1ae97b42b32adde116f..a16fe8cd5bf1c93098576f86f3ccd0310f059236 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -7993,7 +7993,7 @@ AlterSystemSetConfigFile(AlterSystemStmt *altersysstmt)
    if (!superuser())
        ereport(ERROR,
                (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                (errmsg("must be superuser to execute ALTER SYSTEM command"))));
+                errmsg("must be superuser to execute ALTER SYSTEM command")));
 
    /*
     * Extract statement arguments