Changeset cc6fdf8 for nick.c

Timestamp:

2012-12-22T00:14:26Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7d5afa6

Parents:

92d3044 (diff), 573e274 (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 JSON branch. It's very stable by now, and I want more testers.

File:

• nick.c (modified) (2 diffs)

nick.c

@@ -134 +134 @@
                                 chop = fmt[1];
                                 if( chop == '\0' )
+                                {
+                                        g_string_free( ret, TRUE );
                                         return NULL;
+                                }
                                 fmt += 2;
                         }
@@ -187 +190 @@
                         else
                         {
+                                g_string_free( ret, TRUE );
                                 return NULL;
                         }