no getc_unlocked

Author: hp
Date: 2001-07-10 23:16:26 GMT
no getc_unlocked

diff --git a/ChangeLog b/ChangeLog
index 8174d7ce86c4b83098059a6a509591424e8da98d..0ad9d479cd6a6462ac7a8d04e5a55fbd5844e209 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
        (parse_line): allow spelling Cflags as CFlags, pointed out by Tim
        (get_compat_package): support legacy script gnome-vfs-config for
        package name "libgnomevfs"
+       (read_one_line): just blow away all the stupid getc_unlocked crap
 
 2001-06-18  Havoc Pennington  <hp@pobox.com>
 

diff --git a/parse.c b/parse.c
index c769359d54f7297031b964016f77426d2172d59b..b9a70cca121d734fb3123498a27f5b176967d38e 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -12,13 +12,6 @@
 #include <sys/wait.h>
 #include <sys/types.h>
 
-/* since we never use getc_unlocked now we should really
- * do something to speed up read_one_line
- */
-#  define flockfile(f) (void)1
-#  define funlockfile(f) (void)1
-#  define getc_unlocked(f) getc(f)
-
 #ifdef NATIVE_WIN32
 
 #define STRICT
@@ -43,8 +36,6 @@ read_one_line (FILE *stream, GString *str)
   gboolean quoted = FALSE;
   gboolean comment = FALSE;
   int n_read = 0;
-  
-  flockfile (stream);
 
   g_string_truncate (str, 0);
   
@@ -52,7 +43,7 @@ read_one_line (FILE *stream, GString *str)
     {
       int c;
       
-      c = getc_unlocked (stream);
+      c = getc (stream);
 
       if (c == EOF)
        {
@@ -76,7 +67,7 @@ read_one_line (FILE *stream, GString *str)
            case '\r':
            case '\n':
              {
-               int next_c = getc_unlocked (stream);
+               int next_c = getc (stream);
 
                if (!(c == EOF ||
                      (c == '\r' && next_c == '\n') ||
@@ -103,7 +94,7 @@ read_one_line (FILE *stream, GString *str)
              break;
            case '\n':
              {
-               int next_c = getc_unlocked (stream);
+               int next_c = getc (stream);
 
                if (!(c == EOF ||
                      (c == '\r' && next_c == '\n') ||
@@ -121,8 +112,6 @@ read_one_line (FILE *stream, GString *str)
 
  done:
 
-  funlockfile (stream);
-
   return n_read > 0;
 }