Changeset 5142 for trunk/libtransmission/ipcparse.c

Timestamp:

Feb 27, 2008, 4:47:58 PM (14 years ago)

Author:

charles

Message:

make struct ipc_info opaque. const-ify the ipcparse functions where possible.

File:

• trunk/libtransmission/ipcparse.c (modified) (13 diffs)

trunk/libtransmission/ipcparse.c

@@ -63 +63 @@
 #define MSGNAME( id )           ( gl_msgs[(id)].name )
 #define DICTPAYLOAD( info )     ( 2 > (info)->vers )
+
+struct ipc_info
+{
+    struct ipc_funcs * funcs;
+    int                vers;
+};
+
+int
+ipc_hasvers( const struct ipc_info * inf )
+{
+    return inf && ( inf->vers > 0 );
+}
 
 struct msg
@@ -219 +231 @@
 
 static int
-ipc_havemsg( struct ipc_info * info, enum ipc_msg id )
+ipc_havemsg( const struct ipc_info * info, enum ipc_msg id )
 {
     assert( MSGVALID( id ) );
-    assert( HASVERS( info ) );
+    assert( ipc_hasvers( info ) );
 
     return gl_msgs[id].minvers <= info->vers;
@@ -228 +240 @@
 
 tr_benc *
-ipc_initval( struct ipc_info * info, enum ipc_msg id, int64_t tag,
+ipc_initval( const struct ipc_info * info, enum ipc_msg id, int64_t tag,
              tr_benc * pk, int type )
 {
@@ -292 +304 @@
 
 uint8_t *
-ipc_mkempty( struct ipc_info * info, size_t * len, enum ipc_msg id,
+ipc_mkempty( const struct ipc_info * info, size_t * len, enum ipc_msg id,
              int64_t tag )
 {
@@ -308 +320 @@
 
 uint8_t *
-ipc_mkint( struct ipc_info * info, size_t * len, enum ipc_msg id, int64_t tag,
-           int64_t num )
+ipc_mkint( const struct ipc_info * info, size_t * len, enum ipc_msg id,
+           int64_t tag, int64_t num )
 {
     tr_benc pk, * val;
@@ -326 +338 @@
 
 uint8_t *
-ipc_mkstr( struct ipc_info * info, size_t * len, enum ipc_msg id, int64_t tag,
-           const char * str )
+ipc_mkstr( const struct ipc_info * info, size_t * len, enum ipc_msg id,
+           int64_t tag, const char * str )
 {
     tr_benc pk, * val;
@@ -374 +386 @@
 
 uint8_t *
-ipc_mkgetinfo( struct ipc_info * info, size_t * len, enum ipc_msg id,
+ipc_mkgetinfo( const struct ipc_info * info, size_t * len, enum ipc_msg id,
                int64_t tag, int types, const int * ids )
 {
@@ -896 +908 @@
 
 static int
-gotmsg( struct ipc_info * info, tr_benc * name, tr_benc * val,
+gotmsg( const struct ipc_info * info, tr_benc * name, tr_benc * val,
         tr_benc * tagval, void * arg )
 {
@@ -941 +953 @@
 
 static int
-handlemsgs( struct ipc_info * info, tr_benc * pay, void * arg )
+handlemsgs( const struct ipc_info * info, tr_benc * pay, void * arg )
 {
     tr_benc * name, * val, * tag;
     int          ii;
 
-    assert( HASVERS( info ) );
+    assert( ipc_hasvers( info ) );
 
     if( DICTPAYLOAD( info ) )
@@ -1019 +1031 @@
             return -1;
         }
-        if( 0 > ( HASVERS( info ) ? handlemsgs( info, &benc, arg ) :
-                                    handlevers( info, &benc ) ) )
+        if( 0 > ( ipc_hasvers( info ) ? handlemsgs( info, &benc, arg ) :
+                                        handlevers( info, &benc ) ) )
         {
             SAFEBENCFREE( &benc );
@@ -1032 +1044 @@
 
 enum ipc_msg
-ipc_msgid( struct ipc_info * info, const char * name )
+ipc_msgid( const struct ipc_info * info, const char * name )
 {
     const struct msg * msg = msglookup( name );
@@ -1042 +1054 @@
 
 int
-ipc_ishandled( struct ipc_info * info, enum ipc_msg id )
+ipc_ishandled( const struct ipc_info * info, enum ipc_msg id )
 {
     assert( MSGVALID( id ) );
@@ -1050 +1062 @@
 
 int
-ipc_havetags( struct ipc_info * info )
+ipc_havetags( const struct ipc_info * info )
 {
     return !DICTPAYLOAD( info );