Changeset 8e9e2b7 for lib/misc.c

Timestamp:

2010-10-03T02:45:26Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

04f0c10

Parents:

88de0c9 (diff), 2af3e23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging mainline, which includes a huge msnp13 merge.

Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.

File:

• lib/misc.c (modified) (2 diffs)

lib/misc.c

@@ -308 +308 @@
 void http_encode( char *s )
 {
-        char *t;
+        char t[strlen(s)+1];
         int i, j;
         
-        t = g_strdup( s );
-        
+        strcpy( t, s );
         for( i = j = 0; t[i]; i ++, j ++ )
         {
@@ -330 +329 @@
         }
         s[j] = 0;
-        
-        g_free( t );
 }