[Emacs-diffs] trunk r117537: Use "b" flag more consistently; avoid "t".

[Paul Eggert]

------------------------------------------------------------
revno: 117537
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18006
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2014-07-15 12:28:25 -0700
message:
  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".
modified:
  lib-src/ChangeLog              changelog-20091113204419-o5vbwnq5f7feedwu-1608
  lib-src/make-docfile.c         
makedocfile.c-20091113204419-o5vbwnq5f7feedwu-33

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2014-07-14 19:23:18 +0000
+++ b/lib-src/ChangeLog 2014-07-15 19:28:25 +0000
@@ -1,3 +1,9 @@
+2014-07-15  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        Use binary-io module, O_BINARY, and "b" flag (Bug#18006).

=== modified file 'lib-src/make-docfile.c'
--- a/lib-src/make-docfile.c    2014-07-14 19:23:18 +0000
+++ b/lib-src/make-docfile.c    2014-07-15 19:28:25 +0000
@@ -55,12 +55,8 @@
    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 @@
   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