Changeset 9626

Timestamp:

Nov 29, 2009, 8:05:47 AM (13 years ago)

Author:

charles

Message:

(trunk libT) resolve "noslashes" vs "keep_slashes" variable name inconsistency between the declaration and the definition of tr_http_escape()

Location:

trunk/libtransmission

Files:

• announcer.c (modified) (1 diff)
• web.c (modified) (2 diffs)
• web.h (modified) (1 diff)
• webseed.c (modified) (1 diff)

trunk/libtransmission/announcer.c

@@ -704 +704 @@
         inet_ntop( AF_INET6, ipv6, ipv6_readable, INET6_ADDRSTRLEN );
         evbuffer_add_printf( buf, "&ipv6=");
-        tr_http_escape( buf, ipv6_readable, strlen(ipv6_readable), 0 );
+        tr_http_escape( buf, ipv6_readable, strlen(ipv6_readable), TRUE );
     }
 

trunk/libtransmission/web.c

@@ -650 +650 @@
 
 /* escapes a string to be URI-legal as per RFC 2396.
-   like curl_escape() but can optionally avoid munging slashes. */
+   like curl_escape() but can optionally avoid escaping slashes. */
 void
-tr_http_escape( struct evbuffer *out, const char *str, int len, int keep_slashes )
+tr_http_escape( struct evbuffer  * out,
+                const char       * str,
+                int                len,
+                tr_bool            escape_slashes )
 {
     int i;
+
+    if( ( len < 0 ) && ( str != NULL ) )
+        len = strlen( str );
 
     for( i = 0; i < len; i++ ) {
@@ -674 +680 @@
             break;
         case '/':
-            if(keep_slashes) {
+            if(!escape_slashes) {
                 evbuffer_add( out, &str[i], 1 );
                 break;

trunk/libtransmission/web.h

@@ -39 +39 @@
 struct evbuffer;
 
-void tr_http_escape( struct evbuffer *out, const char *str, int len, int noslashes );
+void tr_http_escape( struct evbuffer *out, const char *str, int len, tr_bool escape_slashes );
 
 char* tr_http_unescape( const char * str, int len );

trunk/libtransmission/webseed.c

@@ -110 +110 @@
     /* if url ends with a '/', add the torrent name */
     if( url[url_len - 1] == '/' && file->name )
-        tr_http_escape( out, file->name, strlen(file->name), 1 );
+        tr_http_escape( out, file->name, strlen(file->name), FALSE );
 
     ret = tr_strndup( EVBUFFER_DATA( out ), EVBUFFER_LENGTH( out ) );