From: Bruno Haible <bruno@clisp.org>
Date: Mon, 12 Jan 2004 11:11:19 +0000 (+0000)
Subject: Choose better variable names.
X-Git-Tag: v0.14~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c05ac1298ffeaba978235a1bae7505dbca91aa6;p=thirdparty%2Fgettext.git

Choose better variable names.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 66040263f..d76d157f4 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-28  Bruno Haible  <bruno@clisp.org>
+
+	* read-mo.h (read_mo_file): Change 'fn' into 'filename'.
+	* read-mo.c (read_mo_file): Likewise.
+
 2003-12-28  Bruno Haible  <bruno@clisp.org>
 
 	* write-resources.h: New file.
diff --git a/gettext-tools/src/read-mo.c b/gettext-tools/src/read-mo.c
index fd2e83234..8328347b7 100644
--- a/gettext-tools/src/read-mo.c
+++ b/gettext-tools/src/read-mo.c
@@ -220,7 +220,7 @@ get_sysdep_string (const struct binary_mo_file *bfp, size_t offset,
 
 /* Reads an existing .mo file and adds the messages to mlp.  */
 void
-read_mo_file (message_list_ty *mlp, const char *fn)
+read_mo_file (message_list_ty *mlp, const char *filename)
 {
   FILE *fp;
   struct binary_mo_file bf;
@@ -228,21 +228,21 @@ read_mo_file (message_list_ty *mlp, const char *fn)
   unsigned int i;
   static lex_pos_ty pos = { __FILE__, __LINE__ };
 
-  if (strcmp (fn, "-") == 0 || strcmp (fn, "/dev/stdin") == 0)
+  if (strcmp (filename, "-") == 0 || strcmp (filename, "/dev/stdin") == 0)
     {
       fp = stdin;
       SET_BINARY (fileno (fp));
     }
   else
     {
-      fp = fopen (fn, "rb");
+      fp = fopen (filename, "rb");
       if (fp == NULL)
 	error (EXIT_FAILURE, errno,
-	       _("error while opening \"%s\" for reading"), fn);
+	       _("error while opening \"%s\" for reading"), filename);
     }
 
   /* Read the file contents into memory.  */
-  read_binary_mo_file (&bf, fp, fn);
+  read_binary_mo_file (&bf, fp, filename);
 
   /* Get a 32-bit number from the file header.  */
 # define GET_HEADER_FIELD(field) \
@@ -261,7 +261,7 @@ read_mo_file (message_list_ty *mlp, const char *fn)
 	{
 	unrecognised:
 	  error (EXIT_FAILURE, 0, _("file \"%s\" is not in GNU .mo format"),
-		 fn);
+		 filename);
 	}
     }
 
diff --git a/gettext-tools/src/read-mo.h b/gettext-tools/src/read-mo.h
index 88e969939..12e8cbff7 100644
--- a/gettext-tools/src/read-mo.h
+++ b/gettext-tools/src/read-mo.h
@@ -1,5 +1,5 @@
 /* Reading binary .mo files.
-   Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -22,6 +22,6 @@
 #include "message.h"
 
 /* Reads an existing .mo file and adds the messages to mlp.  */
-extern void read_mo_file (message_list_ty *mlp, const char *fn);
+extern void read_mo_file (message_list_ty *mlp, const char *filename);
 
 #endif /* _READ_MO_H */