Code cleanup: mark some variables with the "const" modifier, when they

are initialized with a string literal. Patch from Stefan Huehner.

diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index d97cfee3751aad978245f72876835b1b7985815a..da5ab61e84bfd164a8104a3052e04bbff589daca 100644 (file)
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.255 2007/03/17 01:15:55 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.256 2007/03/18 16:50:42 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -106,9 +106,9 @@ typedef struct
  * ----------
  */
 static SPIPlanPtr plan_getrulebyoid = NULL;
-static char *query_getrulebyoid = "SELECT * FROM pg_catalog.pg_rewrite WHERE oid = $1";
+static const char *query_getrulebyoid = "SELECT * FROM pg_catalog.pg_rewrite WHERE oid = $1";
 static SPIPlanPtr plan_getviewrule = NULL;
-static char *query_getviewrule = "SELECT * FROM pg_catalog.pg_rewrite WHERE ev_class = $1 AND rulename = $2";
+static const char *query_getviewrule = "SELECT * FROM pg_catalog.pg_rewrite WHERE ev_class = $1 AND rulename = $2";
 
 
 /* ----------

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index b0a875234aa7f4d925fc38c1876e8de74a5c9e11..3d00d1eb68dbb8163c1aee8ae20fb46633c059e5 100644 (file)
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -42,7 +42,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  * Portions taken from FreeBSD.
  *
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.134 2007/02/20 23:49:38 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.135 2007/03/18 16:50:43 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -727,7 +727,7 @@ get_encoding_id(char *encoding_name)
 struct encoding_match
 {
        enum pg_enc pg_enc_code;
-       char       *system_enc_name;
+       const char *system_enc_name;
 };
 
 struct encoding_match encoding_match_list[] = {
@@ -1481,8 +1481,8 @@ static void
 setup_auth(void)
 {
        PG_CMD_DECL;
-       char      **line;
-       static char *pg_authid_setup[] = {
+       const char **line;
+       static const char *pg_authid_setup[] = {
                /*
                 * Create triggers to ensure manual updates to shared catalogs will be
                 * reflected into their "flat file" copies.
@@ -1623,8 +1623,8 @@ static void
 setup_depend(void)
 {
        PG_CMD_DECL;
-       char      **line;
-       static char *pg_depend_setup[] = {
+       const char        **line;
+       static const char *pg_depend_setup[] = {
                /*
                 * Make PIN entries in pg_depend for all objects made so far in the
                 * tables that the dependency code handles.  This is overkill (the
@@ -1990,8 +1990,8 @@ static void
 make_template0(void)
 {
        PG_CMD_DECL;
-       char      **line;
-       static char *template0_setup[] = {
+       const char **line;
+       static const char *template0_setup[] = {
                "CREATE DATABASE template0;\n",
                "UPDATE pg_database SET "
                "       datistemplate = 't', "
@@ -2045,8 +2045,8 @@ static void
 make_postgres(void)
 {
        PG_CMD_DECL;
-       char      **line;
-       static char *postgres_setup[] = {
+       const char **line;
+       static const char *postgres_setup[] = {
                "CREATE DATABASE postgres;\n",
                NULL
        };

diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index ad2d08fd930defb8e00bb6ea7c165ffa6d750c0e..4b6c2f5f9612f7b16aa9943c5a740723685916aa 100644 (file)
--- a/src/bin/pg_controldata/pg_controldata.c
+++ b/src/bin/pg_controldata/pg_controldata.c
@@ -6,7 +6,7 @@
  * copyright (c) Oliver Elphick <olly@lfix.co.uk>, 2001;
  * licence: BSD
  *
- * $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.33 2007/03/03 20:02:27 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.34 2007/03/18 16:50:43 neilc Exp $
  */
 #include "postgres.h"
 
@@ -72,7 +72,7 @@ main(int argc, char *argv[])
        char            pgctime_str[128];
        char            ckpttime_str[128];
        char            sysident_str[32];
-       char       *strftime_fmt = "%c";
+       const char *strftime_fmt = "%c";
        const char *progname;
 
        set_pglocale_pgservice(argv[0], "pg_controldata");

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 615578145702d5fb66c8076d923f288a57970f2a..789b3bfb2e523a3c6e78395fe2f86adcc76635b4 100644 (file)
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.78 2007/02/10 14:58:55 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.79 2007/03/18 16:50:44 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -91,7 +91,7 @@ static char *post_opts = NULL;
 static const char *progname;
 static char *log_file = NULL;
 static char *postgres_path = NULL;
-static char *register_servicename = "PostgreSQL";              /* FIXME: + version ID? */
+static const char *register_servicename = "PostgreSQL";                /* FIXME: + version ID? */
 static char *register_username = NULL;
 static char *register_password = NULL;
 static char *argv0 = NULL;

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 3f014d9c62a4a1dd6710ec8e9800b873b1e6589b..cd979cfaddfab63617549d01370398722cedfe10 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *             $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.142 2007/02/19 15:05:06 mha Exp $
+ *             $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.143 2007/03/18 16:50:44 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,7 +37,7 @@
 
 const char *progname;
 
-static char *modulename = gettext_noop("archiver");
+static const char *modulename = gettext_noop("archiver");
 
 
 static ArchiveHandle *_allocAH(const char *FileSpec, const ArchiveFormat fmt,

diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c
index b859b04af94016162b988a64c6b0e7a86c4f6257..a99dc99101bfe870fcc0549ee99daf951d42628c 100644 (file)
--- a/src/bin/pg_dump/pg_backup_custom.c
+++ b/src/bin/pg_dump/pg_backup_custom.c
@@ -19,7 +19,7 @@
  *
  *
  * IDENTIFICATION
- *             $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.37 2007/02/19 15:05:06 mha Exp $
+ *             $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.38 2007/03/18 16:50:44 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -91,7 +91,7 @@ static void _EndDataCompressor(ArchiveHandle *AH, TocEntry *te);
 static pgoff_t _getFilePos(ArchiveHandle *AH, lclContext *ctx);
 static int     _DoDeflate(ArchiveHandle *AH, lclContext *ctx, int flush);
 
-static char *modulename = gettext_noop("custom archiver");
+static const char *modulename = gettext_noop("custom archiver");
 
 
 

diff --git a/src/bin/pg_dump/pg_backup_files.c b/src/bin/pg_dump/pg_backup_files.c
index f284df4f2b978dc867ba28ec1001d0694827415f..2b292aa579270d2b5594fabf412eecaf6f098c76 100644 (file)
--- a/src/bin/pg_dump/pg_backup_files.c
+++ b/src/bin/pg_dump/pg_backup_files.c
@@ -20,7 +20,7 @@
  *
  *
  * IDENTIFICATION
- *             $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.31 2007/02/19 15:05:06 mha Exp $
+ *             $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.32 2007/03/18 16:50:44 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -65,7 +65,7 @@ typedef struct
        char       *filename;
 } lclTocEntry;
 
-static char *modulename = gettext_noop("file archiver");
+static const char *modulename = gettext_noop("file archiver");
 static void _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt);
 static void _getBlobTocEntry(ArchiveHandle *AH, Oid *oid, char *fname);
 

diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
index 298a2fd0bf2b4653f10aa384e4eef13f0a2eeac0..96287dcbe94302408fa45d20f7059ccc87f14e19 100644 (file)
--- a/src/bin/pg_dump/pg_backup_tar.c
+++ b/src/bin/pg_dump/pg_backup_tar.c
@@ -16,7 +16,7 @@
  *
  *
  * IDENTIFICATION
- *             $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.57 2007/02/19 15:05:06 mha Exp $
+ *             $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.58 2007/03/18 16:50:44 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -102,7 +102,7 @@ typedef struct
        char       *filename;
 } lclTocEntry;
 
-static char *modulename = gettext_noop("tar archiver");
+static const char *modulename = gettext_noop("tar archiver");
 
 static void _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt);
 

diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
index 2d51ace1923cb269873ecf02111c8c94f3ce41ac..a74857fb68eb524712ffa4e35f74305cd50a2814 100644 (file)
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -9,14 +9,14 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump_sort.c,v 1.17 2007/01/23 17:54:50 tgl Exp $
+ *       $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump_sort.c,v 1.18 2007/03/18 16:50:44 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "pg_backup_archiver.h"
 
 
-static char *modulename = gettext_noop("sorter");
+static const char *modulename = gettext_noop("sorter");
 
 /*
  * Sort priority for object types when dumping a pre-7.3 database.

diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 0d6551e447aecce69d0f74e128ae9981442fe64d..5dfaf9367a1da18d127b6bdd3323a3ccac21531e 100644 (file)
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.153 2007/03/16 08:28:01 mha Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.154 2007/03/18 16:50:44 neilc Exp $
  */
 #include "postgres_fe.h"
 #include "describe.h"
@@ -1360,7 +1360,7 @@ describeOneTableDetails(const char *schemaname,
                /* print inherits */
                for (i = 0; i < inherits_count; i++)
                {
-                       char       *s = _("Inherits");
+                       const char   *s = _("Inherits");
 
                        if (i == 0)
                                printfPQExpBuffer(&buf, "%s: %s", s, PQgetvalue(result6, i, 0));
@@ -1374,7 +1374,7 @@ describeOneTableDetails(const char *schemaname,
 
                if (verbose)
                {
-                       char       *s = _("Has OIDs");
+                       const char   *s = _("Has OIDs");
 
                        printfPQExpBuffer(&buf, "%s: %s", s,
                                                          (tableinfo.hasoids ? _("yes") : _("no")));