Refactor: Rename local variables of type '*_catalog_reader_ty *'.

* gettext-tools/src/xgettext.c (read_exclusion_file): Rename local variable
'pop' to 'catr'.
* gettext-tools/src/read-catalog.c (read_catalog_stream): Rename local variable
'pop' to 'dcatr'.

diff --git a/gettext-tools/src/read-catalog.c b/gettext-tools/src/read-catalog.c
index e6fd03416503801a572ae3bb827b213a4b071442..fd221b1f02120a276cd5c53337b369c6f9b8e07a 100644 (file)
--- a/gettext-tools/src/read-catalog.c
+++ b/gettext-tools/src/read-catalog.c
@@ -463,24 +463,24 @@ read_catalog_stream (FILE *fp, const char *real_filename,
                      const char *logical_filename,
                      catalog_input_format_ty input_syntax)
 {
-  default_catalog_reader_ty *pop;
+  default_catalog_reader_ty *dcatr;
   msgdomain_list_ty *mdlp;
 
-  pop = default_catalog_reader_alloc (&default_methods);
-  pop->handle_comments = true;
-  pop->allow_domain_directives = true;
-  pop->allow_duplicates = allow_duplicates;
-  pop->allow_duplicates_if_same_msgstr = false;
-  pop->file_name = real_filename;
-  pop->mdlp = msgdomain_list_alloc (!pop->allow_duplicates);
-  pop->mlp = msgdomain_list_sublist (pop->mdlp, pop->domain, true);
+  dcatr = default_catalog_reader_alloc (&default_methods);
+  dcatr->handle_comments = true;
+  dcatr->allow_domain_directives = true;
+  dcatr->allow_duplicates = allow_duplicates;
+  dcatr->allow_duplicates_if_same_msgstr = false;
+  dcatr->file_name = real_filename;
+  dcatr->mdlp = msgdomain_list_alloc (!dcatr->allow_duplicates);
+  dcatr->mlp = msgdomain_list_sublist (dcatr->mdlp, dcatr->domain, true);
   if (input_syntax->produces_utf8)
     /* We know a priori that input_syntax->parse convert strings to UTF-8.  */
-    pop->mdlp->encoding = po_charset_utf8;
+    dcatr->mdlp->encoding = po_charset_utf8;
   po_lex_pass_obsolete_entries (true);
-  catalog_reader_parse ((abstract_catalog_reader_ty *) pop, fp, real_filename,
+  catalog_reader_parse ((abstract_catalog_reader_ty *) dcatr, fp, real_filename,
                         logical_filename, false, input_syntax);
-  mdlp = pop->mdlp;
-  catalog_reader_free ((abstract_catalog_reader_ty *) pop);
+  mdlp = dcatr->mdlp;
+  catalog_reader_free ((abstract_catalog_reader_ty *) dcatr);
   return mdlp;
 }

diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index 6208e32785dec5ed286ff82631fb67e79020a398..aec4343137f566f88da29ac09bff1f03b9ef6974 100644 (file)
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -1336,11 +1336,11 @@ read_exclusion_file (char *filename)
 {
   char *real_filename;
   FILE *fp = open_catalog_file (filename, &real_filename, true);
-  abstract_catalog_reader_ty *pop;
+  abstract_catalog_reader_ty *catr;
 
-  pop = catalog_reader_alloc (&exclude_methods);
-  catalog_reader_parse (pop, fp, real_filename, filename, true, &input_format_po);
-  catalog_reader_free (pop);
+  catr = catalog_reader_alloc (&exclude_methods);
+  catalog_reader_parse (catr, fp, real_filename, filename, true, &input_format_po);
+  catalog_reader_free (catr);
 
   if (fp != stdin)
     fclose (fp);