--- a/libpurple/protocols/gg/xml.c Mon Feb 03 21:43:13 2014 +0100 +++ b/libpurple/protocols/gg/xml.c Mon Feb 03 21:49:38 2014 +0100 @@ -34,21 +34,21 @@ gboolean ggp_xml_get_string(const PurpleXmlNode *xml, gchar *childName, gchar **var) { char *str; - + g_return_val_if_fail(xml != NULL, FALSE); g_return_val_if_fail(var != NULL, FALSE); - + if (childName != NULL) { xml = purple_xmlnode_get_child(xml, childName); if (xml == NULL) return FALSE; } - + str = purple_xmlnode_get_data(xml); if (str == NULL) return FALSE; - + *var = str; return TRUE; } @@ -57,17 +57,17 @@ { char *str; gboolean succ; - + succ = ggp_xml_get_string(xml, childName, &str); if (!succ) return FALSE; - + *var = (strcmp(str, "true") == 0 || strcmp(str, "True") == 0 || strcmp(str, "TRUE") == 0 || strcmp(str, "1") == 0); g_free(str); - + return TRUE; } @@ -76,17 +76,17 @@ char *str, *endptr; gboolean succ; unsigned int val; - + succ = ggp_xml_get_string(xml, childName, &str); if (!succ) return FALSE; - + errno = 0; val = strtoul(str, &endptr, 10); - + succ = (errno != ERANGE && endptr[0] == '\0'); g_free(str); - + if (succ) *var = val; return succ; @@ -96,7 +96,7 @@ { g_return_val_if_fail(xml != NULL, FALSE); g_return_val_if_fail(val != NULL, FALSE); - + if (childName != NULL) { PurpleXmlNode *child = purple_xmlnode_get_child(xml, childName); @@ -104,10 +104,10 @@ child = purple_xmlnode_new_child(xml, childName); xml = child; } - + ggp_xmlnode_remove_children(xml); purple_xmlnode_insert_data(xml, val, -1); - + return TRUE; } @@ -139,9 +139,9 @@ { PurpleXmlNode *child; unsigned int count = 0; - + g_return_val_if_fail(xml != NULL, 0); - + if (childName) { child = purple_xmlnode_get_child(xml, childName); @@ -160,6 +160,6 @@ count++; } } - + return count; }