Changeset 10754

Timestamp:

Jun 15, 2010, 12:38:10 AM (13 years ago)

Author:

charles

Message:

(trunk libT) #3293 "fggets() is overkill for parsing the blocklist" -- fixed in trunk for 2.00

Location:

trunk/libtransmission

Files:

• Makefile.am (modified) (2 diffs)
• blocklist.c (modified) (4 diffs)
• ggets.c (deleted)
• ggets.h (deleted)

trunk/libtransmission/Makefile.am

@@ -27 +27 @@
     crypto.c \
     fdlimit.c \
-    ggets.c \
     handshake.c \
     history.c \
@@ -78 +77 @@
     completion.h \
     fdlimit.h \
-    ggets.h \
     handshake.h \
     history.h \

trunk/libtransmission/blocklist.c

@@ -28 +28 @@
 #include <assert.h>
 
-#include "ggets.h"
-
 #include "transmission.h"
 #include "platform.h"
@@ -305 +303 @@
                          const char *   filename )
 {
-    FILE *       in;
-    FILE *       out;
-    char *       line;
-    int          inCount = 0;
-    int          outCount = 0;
+    FILE * in;
+    FILE * out;
+    int inCount = 0;
+    int outCount = 0;
+    char line[2048];
     const char * err_fmt = _( "Couldn't read \"%1$s\": %2$s" );
 
@@ -335 +333 @@
     }
 
-    while( !fggets( &line, in ) )
+    while( fgets( line, sizeof( line ), in ) != NULL )
     {
         char * walk;
@@ -350 +348 @@
             /* don't try to display the actual lines - it causes issues */
             tr_err( _( "blocklist skipped invalid address at line %d" ), inCount );
-            free( line );
             continue;
         }
-
-        free( line );
 
         if( fwrite( &range, sizeof( struct tr_ip_range ), 1, out ) != 1 )