Rename 'omit_header'.

diff --git a/src/ChangeLog b/src/ChangeLog
index 945d1647822f1a993e6d1b3049d654580d405e2e..627bfc1884ab31dbd7e5ca434c63287a3256d0fd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,11 @@
 
        * x-java.l (strip_ending_spaces): Fix isspace call.
 
+       * xgettext.h (xgettext_omit_header): Renamed from omit_header.
+       * xgettext.c (xgettext_omit_header): Likewise.
+       (long_options, main, remember_a_message): Update.
+       * x-po.c (extract_directive_message): Update.
+
 2001-12-09  Bruno Haible  <bruno@clisp.org>
 
        * x-lisp.h: New file.

diff --git a/src/x-po.c b/src/x-po.c
index 7738d1120f5437adaff5d55dccedfdabcbf24d2f..f4bd18f9b67a419d97e0df9fa87db07429873f30 100644 (file)
--- a/src/x-po.c
+++ b/src/x-po.c
@@ -131,7 +131,7 @@ extract_directive_message (that, msgid, msgid_pos, msgid_plural,
      away, we have constructed a new one.
      But if no new one was constructed, keep the old header.  This is useful
      because the old header may contain a charset= directive.  */
-  if (*msgid == '\0' && !omit_header)
+  if (*msgid == '\0' && !xgettext_omit_header)
     {
       discard:
       free (msgid);

diff --git a/src/xgettext.c b/src/xgettext.c
index 28b5735f94c8d2afa7a6b2a67d0a45860f0f1009..3ce6e78afa961c82c5a20eaacd5cd478fbdc374f 100644 (file)
--- a/src/xgettext.c
+++ b/src/xgettext.c
@@ -108,7 +108,7 @@ static const char *msgstr_suffix;
 static char *output_dir;
 
 /* If nonzero omit header with information about this run.  */
-int omit_header;
+int xgettext_omit_header;
 
 /* Long options.  */
 static const struct option long_options[] =
@@ -135,7 +135,7 @@ static const struct option long_options[] =
   { "msgstr-suffix", optional_argument, NULL, 'M' },
   { "no-escape", no_argument, NULL, 'e' },
   { "no-location", no_argument, &line_comment, 0 },
-  { "omit-header", no_argument, &omit_header, 1 },
+  { "omit-header", no_argument, &xgettext_omit_header, 1 },
   { "output", required_argument, NULL, 'o' },
   { "output-dir", required_argument, NULL, 'p' },
   { "sort-by-file", no_argument, NULL, 'F' },
@@ -431,7 +431,7 @@ xgettext cannot work without keywords to look for"));
 
   /* Generate a header, so that we know how and when this PO file was
      created.  */
-  if (!omit_header)
+  if (!xgettext_omit_header)
     message_list_append (mdlp->item[0]->messages, construct_header ());
 
   /* Read in the old messages, so that we can add to them.  */
@@ -890,7 +890,7 @@ remember_a_message (mlp, string, pos)
     is_format[i] = undecided;
   do_wrap = undecided;
 
-  if (msgid[0] == '\0' && !omit_header)
+  if (msgid[0] == '\0' && !xgettext_omit_header)
     {
       char buffer[21];
 

diff --git a/src/xgettext.h b/src/xgettext.h
index 81b6632ddb0f1ad5456161596cebc5085476e351..c384fc1f2957fcd7e390febfc0f357a130bc25e1 100644 (file)
--- a/src/xgettext.h
+++ b/src/xgettext.h
@@ -27,7 +27,9 @@
 /* Borrowed from read-po.h.  */
 extern int line_comment;
 
-extern int omit_header;
+/* If true, omit the header entry.
+   If false, keep the header entry present in the input.  */
+extern int xgettext_omit_header;
 
 extern bool substring_match;