Use "b" flag more consistently; avoid "t".

* make-docfile.c (READ_TEXT): Remove; all uses replaced by "r".
(READ_BINARY): Remove; all uses replaced by "rb".

Fixes: debbugs:18006

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index e108f5b2f5dc85605c9a918782100e4d057a1b0a..199d46f49849e8dc62bd8603013013a3422f1357 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2014-07-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Use "b" flag more consistently; avoid "t" (Bug#18006).
+       * make-docfile.c (READ_TEXT): Remove; all uses replaced by "r".
+       (READ_BINARY): Remove; all uses replaced by "rb".
+
 2014-07-14  Paul Eggert  <eggert@cs.ucla.edu>
 
        Use binary-io module, O_BINARY, and "b" flag (Bug#18006).

diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index cb0a56607f8ea59d96c299c6be2b29a678718d17..884b6c1001e42a0e2cdd7d2d97291d5521a54595 100644 (file)
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -55,12 +55,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    Similarly, msdos defines this as sys_chdir, but we're not linking with the
    file where that function is defined.  */
 #undef chdir
-#define READ_TEXT "rt"
-#define READ_BINARY "rb"
 #define IS_SLASH(c)  ((c) == '/' || (c) == '\\' || (c) == ':')
 #else  /* not DOS_NT */
-#define READ_TEXT "r"
-#define READ_BINARY "r"
 #define IS_SLASH(c)  ((c) == '/')
 #endif /* not DOS_NT */
 
@@ -216,11 +212,11 @@ scan_file (char *filename)
   if (!generate_globals)
     put_filename (filename);
   if (len > 4 && !strcmp (filename + len - 4, ".elc"))
-    return scan_lisp_file (filename, READ_BINARY);
+    return scan_lisp_file (filename, "rb");
   else if (len > 3 && !strcmp (filename + len - 3, ".el"))
-    return scan_lisp_file (filename, READ_TEXT);
+    return scan_lisp_file (filename, "r");
   else
-    return scan_c_file (filename, READ_TEXT);
+    return scan_c_file (filename, "r");
 }
 
 static void