devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-23 23:46:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove octet_compare

Browse Source 
strcmp provides the same functionality
This commit is contained in:
Dmitry Podgorny
2013-08-26 02:42:01 +03:00
parent e21bf8a18d
commit 32e18fb1a5
4 changed files with 5 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xmpp/capabilities.c
View File

@@ -148,15 +148,15 @@ caps_create_sha1_str(xmpp_stanza_t * const query)
g_string_append(identity_str, name);
}
g_string_append(identity_str, "<");
identities = g_slist_insert_sorted(identities, g_strdup(identity_str->str), (GCompareFunc)octet_compare);
identities = g_slist_insert_sorted(identities, g_strdup(identity_str->str), (GCompareFunc)strcmp);
g_string_free(identity_str, TRUE);
} else if (g_strcmp0(xmpp_stanza_get_name(child), STANZA_NAME_FEATURE) == 0) {
feature_str = xmpp_stanza_get_attribute(child, "var");
features = g_slist_insert_sorted(features, g_strdup(feature_str), (GCompareFunc)octet_compare);
features = g_slist_insert_sorted(features, g_strdup(feature_str), (GCompareFunc)strcmp);
} else if (g_strcmp0(xmpp_stanza_get_name(child), STANZA_NAME_X) == 0) {
if (strcmp(xmpp_stanza_get_ns(child), STANZA_NS_DATA) == 0) {
form = stanza_create_form(child);
form_names = g_slist_insert_sorted(form_names, g_strdup(form->form_type), (GCompareFunc)octet_compare);
form_names = g_slist_insert_sorted(form_names, g_strdup(form->form_type), (GCompareFunc)strcmp);
g_hash_table_insert(forms, g_strdup(form->form_type), form);
}
}

4
src/xmpp/stanza.c
View File

@@ -853,7 +853,7 @@ stanza_create_form(xmpp_stanza_t * const stanza)
while (value != NULL) {
char *text = xmpp_stanza_get_text(value);
if (text != NULL) {
field->values = g_slist_insert_sorted(field->values, strdup(text), (GCompareFunc)octet_compare);
field->values = g_slist_insert_sorted(field->values, strdup(text), (GCompareFunc)strcmp);
xmpp_free(ctx, text);
}
value = xmpp_stanza_get_next(value);
@@ -997,5 +997,5 @@ stanza_get_presence_string_from_type(resource_presence_t presence_type)
static int
_field_compare(FormField *f1, FormField *f2)
{
return octet_compare((unsigned char *)f1->var, (unsigned char *)f2->var);
return strcmp(f1->var, f2->var);
}