Changeset 9464

Timestamp:

Nov 1, 2009, 1:35:06 AM (13 years ago)

Author:

charles

Message:

(trunk libT) use attribute((nonnull)) where appropriate. remove two unused functions tr_int2ptr(), tr_ptr2int()

Location:

trunk/libtransmission

Files:

• request-list.c (modified) (2 diffs)
• utils.c (modified) (3 diffs)
• utils.h (modified) (13 diffs)

trunk/libtransmission/request-list.c

@@ -76 +76 @@
 
 void
-reqListAppend( struct request_list *       list,
-               const struct peer_request * req )
+reqListAppend( struct request_list * list, const struct peer_request * req )
 {
     int low;
+    tr_bool exact;
 
     reqListReserve( list, list->len + 8 );
@@ -87 +87 @@
 
     /* insert into list->sort */
-    low = reqListSortPos( list, req, NULL );
+    low = reqListSortPos( list, req, &exact );
     memmove( &list->sort[low+1], &list->sort[low], (list->len-low)*sizeof(struct peer_request) );
     list->sort[low] = *req;

trunk/libtransmission/utils.c

@@ -1083 +1083 @@
 }
 
-int
-tr_ptr2int( void* v )
-{
-    return (intptr_t)v;
-}
-
-void*
-tr_int2ptr( int i )
-{
-    return (void*)(intptr_t)i;
-}
-
 /***
 ****
@@ -1110 +1098 @@
     const char * cbase = base;
     tr_bool exact = FALSE;
-    int c;
-
-    while( nmemb )
+
+    while( nmemb != 0 )
     {
         const size_t half = nmemb / 2;
         const size_t middle = first + half;
-        c = compar( key, cbase + size*middle );
+        const int c = compar( key, cbase + size*middle );
 
         if( c <= 0 ) {
@@ -1128 +1115 @@
     }
 
-    if( exact_match )
-        *exact_match = exact;
+    *exact_match = exact;
 
     return first;

trunk/libtransmission/utils.h

@@ -55 +55 @@
 #ifndef TR_GNUC_PRINTF
  #ifdef __GNUC__
-  #define TR_GNUC_PRINTF( fmt,\
-                          args ) __attribute__ ( ( format ( printf, fmt,\
-                                                            args ) ) )
+  #define TR_GNUC_PRINTF( fmt, args ) __attribute__ ( ( format ( printf, fmt, args ) ) )
  #else
   #define TR_GNUC_PRINTF( fmt, args )
@@ -63 +61 @@
 #endif
 
+#ifndef TR_GNUC_NONNULL
+ #ifdef __GNUC__
+  #define TR_GNUC_NONNULL( ... ) __attribute__((nonnull (__VA_ARGS__)))
+ #else
+  #define TR_GNUC_NONNULL( ... )
+ #endif
+#endif
+
 #ifndef TR_GNUC_NULL_TERMINATED
  #if __GNUC__ >= 4
   #define TR_GNUC_NULL_TERMINATED __attribute__ ( ( __sentinel__ ) )
+  #define TR_GNUC_HOT __attribute ( ( hot ) )
  #else
   #define TR_GNUC_NULL_TERMINATED
+  #define TR_GNUC_HOT
  #endif
 #endif
@@ -189 +197 @@
                            const char * name,
                            const char * fmt,
-                           ... ) TR_GNUC_PRINTF( 4, 5 );
+                           ... ) TR_GNUC_PRINTF( 4, 5 ) TR_GNUC_NONNULL(1,4);
 
 char*          tr_getLogTimeStr( char * buf,
-                                 int    buflen );
+                                 int    buflen ) TR_GNUC_NONNULL(1);
 
 
 int            tr_wildmat( const char * text,
-                           const char * pattern );
+                           const char * pattern ) TR_GNUC_NONNULL(1,2);
 
 /** @brief Portability wrapper for basename() that uses the system implementation if available */
@@ -214 +222 @@
  */
 int            tr_mkdir( const char * path,
-                         int          permissions );
+                         int          permissions ) TR_GNUC_NONNULL(1);
 
 /**
@@ -222 +230 @@
  * (in which case errno is set appropriately).
  */
-int tr_mkdirp( const char * path, int permissions );
+int tr_mkdirp( const char * path, int permissions ) TR_GNUC_NONNULL(1);
 
 
@@ -229 +237 @@
  * On failure, NULL is returned and errno is set.
  */
-uint8_t* tr_loadFile( const char * filename, size_t * size ) TR_GNUC_MALLOC;
+uint8_t* tr_loadFile( const char * filename, size_t * size ) TR_GNUC_MALLOC TR_GNUC_NONNULL(1);
 
 
@@ -324 +332 @@
                    size_t       size,
                    int       (* compar)(const void* key, const void* arrayMember),
-                   tr_bool    * exact_match );
+                   tr_bool    * exact_match ) TR_GNUC_HOT TR_GNUC_NONNULL(1,5,6);
 
 
@@ -343 +351 @@
 /** @brief Portability wrapper for snprintf() that uses the system implementation if available */
 int tr_snprintf( char * buf, size_t buflen,
-                 const char * fmt, ... ) TR_GNUC_PRINTF( 3, 4 );
+                 const char * fmt, ... ) TR_GNUC_PRINTF( 3, 4 ) TR_GNUC_NONNULL(1,3);
 
 const char* tr_strerror( int );
@@ -361 +369 @@
 typedef void ( tr_set_func )( void * element, void * userData );
 
-void        tr_set_compare( const void * a,
-                            size_t aCount,
-                            const void * b,
-                            size_t bCount,
+void        tr_set_compare( const void * a, size_t aCount,
+                            const void * b, size_t bCount,
                             int compare( const void * a, const void * b ),
                             size_t elementSize,
@@ -373 +379 @@
 
 void tr_sha1_to_hex( char *          out,
-                     const uint8_t * sha1 );
-
-
-tr_bool tr_httpIsValidURL( const char * url );
+                     const uint8_t * sha1 ) TR_GNUC_NONNULL(1,2);
+
+
+tr_bool tr_httpIsValidURL( const char * url ) TR_GNUC_NONNULL(1);
 
 int  tr_httpParseURL( const char * url,
@@ -382 +388 @@
                       char **      setme_host,
                       int *        setme_port,
-                      char **      setme_path );
+                      char **      setme_path ) TR_GNUC_NONNULL(1);
 
 double tr_getRatio( double numerator, double denominator );
 
-int* tr_parseNumberRange( const char * str, int str_len, int * setmeCount ) TR_GNUC_MALLOC;
-
-
-int tr_ptr2int( void* );
-
-void* tr_int2ptr( int );
+int* tr_parseNumberRange( const char * str, int str_len, int * setmeCount ) TR_GNUC_MALLOC TR_GNUC_NONNULL(1);
+
 
 /* truncate a double value at a given number of decimal places.
@@ -413 +415 @@
  * @param the string represntation of "infinity"
  */
-char* tr_strratio( char * buf, size_t buflen, double ratio, const char * infinity );
+char* tr_strratio( char * buf, size_t buflen, double ratio, const char * infinity ) TR_GNUC_NONNULL(1,4);
 
 /** @brief Portability wrapper for localtime_r() that uses the system implementation if available */
@@ -420 +422 @@
 
 /** on success, return 0.  on failure, return -1 and set errno */
-int tr_moveFile( const char * oldpath, const char * newpath, tr_bool * renamed );
+int tr_moveFile( const char * oldpath, const char * newpath, tr_bool * renamed ) TR_GNUC_NONNULL(1,2);