Changeset 7752

Timestamp:

Jan 19, 2009, 9:37:34 PM (13 years ago)

Author:

charles

Message:

(trunk libT) fix two bugs introduced yesterday's add-torrent changes and uncovered/reported by anf6

File:

• trunk/libtransmission/rpcimpl.c (modified) (6 diffs)

trunk/libtransmission/rpcimpl.c

@@ -928 +928 @@
               void                   * callback_user_data )
 {
-    int64_t      i;
+    int i;
     const char * str;
-    tr_benc *    args_in = tr_bencDictFind( request, "arguments" );
+    tr_benc * args_in = tr_bencDictFind( request, "arguments" );
     const char * result = NULL;
 
@@ -948 +948 @@
     if( result != NULL )
     {
+        int64_t tag;
         tr_benc response;
         struct evbuffer * buf = tr_getBuffer( );
@@ -954 +955 @@
         tr_bencDictAddDict( &response, "arguments", 0 );
         tr_bencDictAddStr( &response, "result", result );
-        if( tr_bencDictFindInt( request, "tag", &i ) )
-            tr_bencDictAddInt( &response, "tag", i );
+        if( tr_bencDictFindInt( request, "tag", &tag ) )
+            tr_bencDictAddInt( &response, "tag", tag );
         tr_bencSaveAsJSON( &response, buf );
         (*callback)( session, (const char*)EVBUFFER_DATA(buf),
@@ -966 +967 @@
     if( methods[i].immediate )
     {
+        int64_t tag;
         tr_benc response;
         tr_benc * args_out;
@@ -976 +978 @@
             result = "success";
         tr_bencDictAddStr( &response, "result", result );
-        if( tr_bencDictFindInt( request, "tag", &i ) )
-            tr_bencDictAddInt( &response, "tag", i );
+        if( tr_bencDictFindInt( request, "tag", &tag ) )
+            tr_bencDictAddInt( &response, "tag", tag );
         tr_bencSaveAsJSON( &response, buf );
         (*callback)( session, (const char*)EVBUFFER_DATA(buf),
@@ -987 +989 @@
     else
     {
+        int64_t tag;
         struct tr_rpc_idle_data * data = tr_new0( struct tr_rpc_idle_data, 1 );
         data->session = session;
         data->response = tr_new0( tr_benc, 1 );
-        if( tr_bencDictFindInt( request, "tag", &i ) )
-            tr_bencDictAddInt( data->response, "tag", i );
         tr_bencInitDict( data->response, 3 );
+        if( tr_bencDictFindInt( request, "tag", &tag ) )
+            tr_bencDictAddInt( data->response, "tag", tag );
         data->args_out = tr_bencDictAddDict( data->response, "arguments", 0 );
         data->callback = callback;