aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-04-22 03:32:49 -04:00
Code

Use null check convention in capabilities.c

Browse Source
This commit is contained in:
James Booth 2015-05-04 23:15:15 +01:00
parent 398eac4ed6
commit 067ad7fa2c
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/xmpp/capabilities.c
View File

@ -203,7 +203,7 @@ _caps_by_ver(const char * const ver)
gsize features_len = 0; gsize features_len = 0;
gchar **features = g_key_file_get_string_list(cache, ver, "features", &features_len, NULL); gchar **features = g_key_file_get_string_list(cache, ver, "features", &features_len, NULL);
if (features != NULL && features_len > 0) { if (features && features_len > 0) {
GSList *features_list = NULL; GSList *features_list = NULL;
int i; int i;
for (i = 0; i < features_len; i++) { for (i = 0; i < features_len; i++) {
@ -395,16 +395,16 @@ caps_create(xmpp_stanza_t *query)
GSList *features = NULL; GSList *features = NULL;
xmpp_stanza_t *softwareinfo = xmpp_stanza_get_child_by_ns(query, STANZA_NS_DATA); xmpp_stanza_t *softwareinfo = xmpp_stanza_get_child_by_ns(query, STANZA_NS_DATA);
if (softwareinfo != NULL) { if (softwareinfo) {
DataForm *form = form_create(softwareinfo); DataForm *form = form_create(softwareinfo);
FormField *formField = NULL; FormField *formField = NULL;
char *form_type = form_get_form_type_field(form); char *form_type = form_get_form_type_field(form);
if (g_strcmp0(form_type, STANZA_DATAFORM_SOFTWARE) == 0) { if (g_strcmp0(form_type, STANZA_DATAFORM_SOFTWARE) == 0) {
GSList *field = form->fields; GSList *field = form->fields;
while (field != NULL) { while (field) {
formField = field->data; formField = field->data;
if (formField->values != NULL) { if (formField->values) {
if (strcmp(formField->var, "software") == 0) { if (strcmp(formField->var, "software") == 0) {
software = strdup(formField->values->data); software = strdup(formField->values->data);
} else if (strcmp(formField->var, "software_version") == 0) { } else if (strcmp(formField->var, "software_version") == 0) {
@ -424,7 +424,7 @@ caps_create(xmpp_stanza_t *query)
xmpp_stanza_t *child = xmpp_stanza_get_children(query); xmpp_stanza_t *child = xmpp_stanza_get_children(query);
GSList *identity_stanzas = NULL; GSList *identity_stanzas = NULL;
while (child != NULL) { while (child) {
if (g_strcmp0(xmpp_stanza_get_name(child), "feature") == 0) { if (g_strcmp0(xmpp_stanza_get_name(child), "feature") == 0) {
features = g_slist_append(features, strdup(xmpp_stanza_get_attribute(child, "var"))); features = g_slist_append(features, strdup(xmpp_stanza_get_attribute(child, "var")));
} }
@ -490,42 +490,42 @@ caps_create(xmpp_stanza_t *query)
Capabilities *new_caps = malloc(sizeof(struct capabilities_t)); Capabilities *new_caps = malloc(sizeof(struct capabilities_t));
if (category != NULL) { if (category) {
new_caps->category = strdup(category); new_caps->category = strdup(category);
} else { } else {
new_caps->category = NULL; new_caps->category = NULL;
} }
if (type != NULL) { if (type) {
new_caps->type = strdup(type); new_caps->type = strdup(type);
} else { } else {
new_caps->type = NULL; new_caps->type = NULL;
} }
if (name != NULL) { if (name) {
new_caps->name = strdup(name); new_caps->name = strdup(name);
} else { } else {
new_caps->name = NULL; new_caps->name = NULL;
} }
if (software != NULL) { if (software) {
new_caps->software = software; new_caps->software = software;
} else { } else {
new_caps->software = NULL; new_caps->software = NULL;
} }
if (software_version != NULL) { if (software_version) {
new_caps->software_version = software_version; new_caps->software_version = software_version;
} else { } else {
new_caps->software_version = NULL; new_caps->software_version = NULL;
} }
if (os != NULL) { if (os) {
new_caps->os = os; new_caps->os = os;
} else { } else {
new_caps->os = NULL; new_caps->os = NULL;
} }
if (os_version != NULL) { if (os_version) {
new_caps->os_version = os_version; new_caps->os_version = os_version;
} else { } else {
new_caps->os_version = NULL; new_caps->os_version = NULL;
} }
if (features != NULL) { if (features) {
new_caps->features = features; new_caps->features = features;
} else { } else {
new_caps->features = NULL; new_caps->features = NULL;
@ -635,7 +635,7 @@ caps_close(void)
void void
caps_destroy(Capabilities *caps) caps_destroy(Capabilities *caps)
{ {
if (caps != NULL) { if (caps) {
free(caps->category); free(caps->category);
free(caps->type); free(caps->type);
free(caps->name); free(caps->name);
@ -643,7 +643,7 @@ caps_destroy(Capabilities *caps)
free(caps->software_version); free(caps->software_version);
free(caps->os); free(caps->os);
free(caps->os_version); free(caps->os_version);
if (caps->features != NULL) { if (caps->features) {
g_slist_free_full(caps->features, free); g_slist_free_full(caps->features, free);
} }
free(caps); free(caps);