devs/cproof
1
2
Fork 1
Code Issues 42 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Use null check convention in roster.c

Browse Source
This commit is contained in:
James Booth
2015-05-04 23:22:06 +01:00
parent 8e64323503
commit defa955ae0
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/xmpp/roster.c
View File

@@ -132,7 +132,7 @@ roster_send_add_to_group(const char * const group, PContact contact)
{ {
GSList *groups = p_contact_groups(contact); GSList *groups = p_contact_groups(contact);
GSList *new_groups = NULL; GSList *new_groups = NULL;
while (groups != NULL) { while (groups) {
new_groups = g_slist_append(new_groups, strdup(groups->data)); new_groups = g_slist_append(new_groups, strdup(groups->data));
groups = g_slist_next(groups); groups = g_slist_next(groups);
} }
@@ -142,7 +142,7 @@ roster_send_add_to_group(const char * const group, PContact contact)
char *unique_id = create_unique_id(NULL); char *unique_id = create_unique_id(NULL);
GroupData *data = malloc(sizeof(GroupData)); GroupData *data = malloc(sizeof(GroupData));
data->group = strdup(group); data->group = strdup(group);
if (p_contact_name(contact) != NULL) { if (p_contact_name(contact)) {
data->name = strdup(p_contact_name(contact)); data->name = strdup(p_contact_name(contact));
} else { } else {
data->name = strdup(p_contact_barejid(contact)); data->name = strdup(p_contact_barejid(contact));
@@ -162,7 +162,7 @@ static int
_group_add_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, _group_add_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
void * const userdata) void * const userdata)
{ {
if (userdata != NULL) { if (userdata) {
GroupData *data = userdata; GroupData *data = userdata;
ui_group_added(data->name, data->group); ui_group_added(data->name, data->group);
free(data->name); free(data->name);
@@ -177,7 +177,7 @@ roster_send_remove_from_group(const char * const group, PContact contact)
{ {
GSList *groups = p_contact_groups(contact); GSList *groups = p_contact_groups(contact);
GSList *new_groups = NULL; GSList *new_groups = NULL;
while (groups != NULL) { while (groups) {
if (strcmp(groups->data, group) != 0) { if (strcmp(groups->data, group) != 0) {
new_groups = g_slist_append(new_groups, strdup(groups->data)); new_groups = g_slist_append(new_groups, strdup(groups->data));
} }
@@ -191,7 +191,7 @@ roster_send_remove_from_group(const char * const group, PContact contact)
char *unique_id = create_unique_id(NULL); char *unique_id = create_unique_id(NULL);
GroupData *data = malloc(sizeof(GroupData)); GroupData *data = malloc(sizeof(GroupData));
data->group = strdup(group); data->group = strdup(group);
if (p_contact_name(contact) != NULL) { if (p_contact_name(contact)) {
data->name = strdup(p_contact_name(contact)); data->name = strdup(p_contact_name(contact));
} else { } else {
data->name = strdup(p_contact_barejid(contact)); data->name = strdup(p_contact_barejid(contact));
@@ -209,7 +209,7 @@ static int
_group_remove_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, _group_remove_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
void * const userdata) void * const userdata)
{ {
if (userdata != NULL) { if (userdata) {
GroupData *data = userdata; GroupData *data = userdata;
ui_group_removed(data->name, data->group); ui_group_removed(data->name, data->group);
free(data->name); free(data->name);
@@ -235,7 +235,7 @@ _roster_set_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
// if from attribute exists and it is not current users barejid, ignore push // if from attribute exists and it is not current users barejid, ignore push
Jid *my_jid = jid_create(jabber_get_fulljid()); Jid *my_jid = jid_create(jabber_get_fulljid());
const char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM); const char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM);
if ((from != NULL) && (strcmp(from, my_jid->barejid) != 0)) { if (from && (strcmp(from, my_jid->barejid) != 0)) {
jid_destroy(my_jid); jid_destroy(my_jid);
return 1; return 1;
} }
@@ -266,7 +266,7 @@ _roster_set_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
// check for pending out subscriptions // check for pending out subscriptions
gboolean pending_out = FALSE; gboolean pending_out = FALSE;
if ((ask != NULL) && (strcmp(ask, "subscribe") == 0)) { if (ask && (strcmp(ask, "subscribe") == 0)) {
pending_out = TRUE; pending_out = TRUE;
} }
@@ -300,7 +300,7 @@ _roster_result_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
xmpp_stanza_t *query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY); xmpp_stanza_t *query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY);
xmpp_stanza_t *item = xmpp_stanza_get_children(query); xmpp_stanza_t *item = xmpp_stanza_get_children(query);
while (item != NULL) { while (item) {
const char *barejid = xmpp_stanza_get_attribute(item, STANZA_ATTR_JID); const char *barejid = xmpp_stanza_get_attribute(item, STANZA_ATTR_JID);
gchar *barejid_lower = g_utf8_strdown(barejid, -1); gchar *barejid_lower = g_utf8_strdown(barejid, -1);
const char *name = xmpp_stanza_get_attribute(item, STANZA_ATTR_NAME); const char *name = xmpp_stanza_get_attribute(item, STANZA_ATTR_NAME);
@@ -344,10 +344,10 @@ _get_groups_from_item(xmpp_stanza_t *item)
GSList *groups = NULL; GSList *groups = NULL;
xmpp_stanza_t *group_element = xmpp_stanza_get_children(item); xmpp_stanza_t *group_element = xmpp_stanza_get_children(item);
while (group_element != NULL) { while (group_element) {
if (strcmp(xmpp_stanza_get_name(group_element), STANZA_NAME_GROUP) == 0) { if (strcmp(xmpp_stanza_get_name(group_element), STANZA_NAME_GROUP) == 0) {
char *groupname = xmpp_stanza_get_text(group_element); char *groupname = xmpp_stanza_get_text(group_element);
if (groupname != NULL) { if (groupname) {
groups = g_slist_append(groups, groupname); groups = g_slist_append(groups, groupname);
} }
} }