Message style improvements

[postgresql] / src / backend / utils / misc / help_config.c

diff --git a/src/backend/utils/misc/help_config.c b/src/backend/utils/misc/help_config.c
index a3bcff212604295893fa61b9cea9010f53a68c53..a0c1082db265dbdd7065bf14cdb45924fcd806fc 100644 (file)
--- a/src/backend/utils/misc/help_config.c
+++ b/src/backend/utils/misc/help_config.c
@@ -7,10 +7,10 @@
  * or GUC_DISALLOW_IN_FILE are not displayed, unless the user specifically
  * requests that variable by name
  *
- * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/utils/misc/help_config.c,v 1.9 2003/11/29 19:52:04 pgsql Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/misc/help_config.c,v 1.17 2006/07/14 14:52:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
 #include <limits.h>
 #include <unistd.h>
 
-#include "utils/guc.h"
 #include "utils/guc_tables.h"
 #include "utils/help_config.h"
 
@@ -46,14 +45,19 @@ static bool displayStruct(mixedStruct *structToDisplay);
 int
 GucInfoMain(void)
 {
-       int                     i;
+       struct config_generic **guc_vars;
+       int                     numOpts,
+                               i;
 
        /* Initialize the guc_variables[] array */
        build_guc_variables();
 
-       for (i = 0; i < num_guc_variables; i++)
+       guc_vars = get_guc_variables();
+       numOpts = GetNumConfigOptions();
+
+       for (i = 0; i < numOpts; i++)
        {
-               mixedStruct *var = (mixedStruct *) guc_variables[i];
+               mixedStruct *var = (mixedStruct *) guc_vars[i];
 
                if (displayStruct(var))
                        printMixedStruct(var);
@@ -86,7 +90,7 @@ printMixedStruct(mixedStruct *structToPrint)
        printf("%s\t%s\t%s\t",
                   structToPrint->generic.name,
                   GucContext_Names[structToPrint->generic.context],
-                  gettext(config_group_names[structToPrint->generic.group]));
+                  _(config_group_names[structToPrint->generic.group]));
 
        switch (structToPrint->generic.vartype)
        {
@@ -117,11 +121,11 @@ printMixedStruct(mixedStruct *structToPrint)
                        break;
 
                default:
-                       fprintf(stderr, "internal error: unrecognized run-time parameter type\n");
+                       write_stderr("internal error: unrecognized run-time parameter type\n");
                        break;
        }
 
        printf("%s\t%s\n",
-                  (structToPrint->generic.short_desc == NULL) ? "" : gettext(structToPrint->generic.short_desc),
-                  (structToPrint->generic.long_desc == NULL) ? "" : gettext(structToPrint->generic.long_desc));
+                  (structToPrint->generic.short_desc == NULL) ? "" : _(structToPrint->generic.short_desc),
+                  (structToPrint->generic.long_desc == NULL) ? "" : _(structToPrint->generic.long_desc));
 }