Changeset 6945

Timestamp:

Oct 22, 2008, 5:14:50 PM (12 years ago)

Author:

charles

Message:

(libT) add some extra gcc safeguards. fix a couple of compiler warnings in makemeta

Location:

trunk/libtransmission

Files:

• crypto.h (modified) (2 diffs)
• makemeta.c (modified) (2 diffs)
• utils.h (modified) (1 diff)

trunk/libtransmission/crypto.h

@@ -15 +15 @@
 
 #include <inttypes.h>
+
+#include <libtransmission/utils.h> /* TR_GNUC_NULL_TERMINATED */
 
 /**
@@ -74 +76 @@
                         const void * content1,
                         int          content1_len,
-                        ... );
+                        ... ) TR_GNUC_NULL_TERMINATED;
 
 

trunk/libtransmission/makemeta.c

@@ -216 +216 @@
     {
         b->my_errno = errno;
-        tr_snprintf( b->errfile, sizeof( b->errfile ),
-                     b->files[fileIndex].filename );
+        tr_strlcpy( b->errfile,
+                    b->files[fileIndex].filename,
+                    sizeof( b->errfile ) );
         b->result = TR_MAKEMETA_IO_READ;
         tr_free( buf );
@@ -251 +252 @@
                     {
                         b->my_errno = errno;
-                        tr_snprintf( b->errfile, sizeof( b->errfile ),
-                                     b->files[fileIndex].filename );
+                        tr_strlcpy( b->errfile,
+                                    b->files[fileIndex].filename,
+                                    sizeof( b->errfile ) );
                         b->result = TR_MAKEMETA_IO_READ;
                         tr_free( buf );

trunk/libtransmission/utils.h

@@ -259 +259 @@
                          size_t       buflen,
                          const char * fmt,
-                         ... );
+                         ... ) TR_GNUC_PRINTF( 3, 4 );
 
 const char* tr_strerror( int );