aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Use null check convention in presence.c

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

42
src/xmpp/presence.c
View File

@ -171,7 +171,7 @@ presence_sub_request_exists(const char * const bare_jid)
GSList *requests_p = autocomplete_create_list(sub_requests_ac); GSList *requests_p = autocomplete_create_list(sub_requests_ac);
GSList *requests = requests_p; GSList *requests = requests_p;
while (requests != NULL) { while (requests) {
if (strcmp(requests->data, bare_jid) == 0) { if (strcmp(requests->data, bare_jid) == 0) {
result = TRUE; result = TRUE;
break; break;
@ -179,7 +179,7 @@ presence_sub_request_exists(const char * const bare_jid)
requests = g_slist_next(requests); requests = g_slist_next(requests);
} }
if (requests_p != NULL) { if (requests_p) {
g_slist_free_full(requests_p, free); g_slist_free_full(requests_p, free);
} }
@ -201,7 +201,7 @@ presence_update(const resource_presence_t presence_type, const char * const msg,
return; return;
} }
if (msg != NULL) { if (msg) {
log_debug("Updating presence: %s, \"%s\"", log_debug("Updating presence: %s, \"%s\"",
string_from_resource_presence(presence_type), msg); string_from_resource_presence(presence_type), msg);
} else { } else {
@ -246,11 +246,11 @@ _send_room_presence(xmpp_conn_t *conn, xmpp_stanza_t *presence)
GList *rooms_p = muc_rooms(); GList *rooms_p = muc_rooms();
GList *rooms = rooms_p; GList *rooms = rooms_p;
while (rooms != NULL) { while (rooms) {
const char *room = rooms->data; const char *room = rooms->data;
const char *nick = muc_nick(room); const char *nick = muc_nick(room);
if (nick != NULL) { if (nick) {
char *full_room_jid = create_fulljid(room, nick); char *full_room_jid = create_fulljid(room, nick);
xmpp_stanza_set_attribute(presence, STANZA_ATTR_TO, full_room_jid); xmpp_stanza_set_attribute(presence, STANZA_ATTR_TO, full_room_jid);
@ -262,7 +262,7 @@ _send_room_presence(xmpp_conn_t *conn, xmpp_stanza_t *presence)
rooms = g_list_next(rooms); rooms = g_list_next(rooms);
} }
if (rooms_p != NULL) { if (rooms_p) {
g_list_free(rooms_p); g_list_free(rooms_p);
} }
} }
@ -334,7 +334,7 @@ presence_leave_chat_room(const char * const room_jid)
xmpp_conn_t *conn = connection_get_conn(); xmpp_conn_t *conn = connection_get_conn();
char *nick = muc_nick(room_jid); char *nick = muc_nick(room_jid);
if (nick != NULL) { if (nick) {
xmpp_stanza_t *presence = stanza_create_room_leave_presence(ctx, room_jid, xmpp_stanza_t *presence = stanza_create_room_leave_presence(ctx, room_jid,
nick); nick);
xmpp_send(conn, presence); xmpp_send(conn, presence);
@ -351,11 +351,11 @@ _presence_error_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
xmpp_stanza_t *error_stanza = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_ERROR); xmpp_stanza_t *error_stanza = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_ERROR);
xmpp_stanza_t *x = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_X); xmpp_stanza_t *x = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_X);
char *xmlns = NULL; char *xmlns = NULL;
if (x != NULL) { if (x) {
xmlns = xmpp_stanza_get_ns(x); xmlns = xmpp_stanza_get_ns(x);
} }
char *type = NULL; char *type = NULL;
if (error_stanza != NULL) { if (error_stanza) {
type = xmpp_stanza_get_attribute(error_stanza, STANZA_ATTR_TYPE); type = xmpp_stanza_get_attribute(error_stanza, STANZA_ATTR_TYPE);
} }
@ -365,7 +365,7 @@ _presence_error_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
char *error_cond = NULL; char *error_cond = NULL;
xmpp_stanza_t *reason_st = xmpp_stanza_get_child_by_ns(error_stanza, STANZA_NS_STANZAS); xmpp_stanza_t *reason_st = xmpp_stanza_get_child_by_ns(error_stanza, STANZA_NS_STANZAS);
if (reason_st != NULL) { if (reason_st) {
error_cond = xmpp_stanza_get_name(reason_st); error_cond = xmpp_stanza_get_name(reason_st);
} }
if (error_cond == NULL) { if (error_cond == NULL) {
@ -385,15 +385,15 @@ _presence_error_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
char *err_msg = stanza_get_error_message(stanza); char *err_msg = stanza_get_error_message(stanza);
GString *log_msg = g_string_new("presence stanza error received"); GString *log_msg = g_string_new("presence stanza error received");
if (id != NULL) { if (id) {
g_string_append(log_msg, " id="); g_string_append(log_msg, " id=");
g_string_append(log_msg, id); g_string_append(log_msg, id);
} }
if (from != NULL) { if (from) {
g_string_append(log_msg, " from="); g_string_append(log_msg, " from=");
g_string_append(log_msg, from); g_string_append(log_msg, from);
} }
if (type != NULL) { if (type) {
g_string_append(log_msg, " type="); g_string_append(log_msg, " type=");
g_string_append(log_msg, type); g_string_append(log_msg, type);
} }
@ -404,7 +404,7 @@ _presence_error_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
g_string_free(log_msg, TRUE); g_string_free(log_msg, TRUE);
if (from != NULL) { if (from) {
ui_handle_recipient_error(from, err_msg); ui_handle_recipient_error(from, err_msg);
} else { } else {
ui_handle_error(err_msg); ui_handle_error(err_msg);
@ -487,7 +487,7 @@ _unavailable_handler(xmpp_conn_t * const conn,
char *status_str = stanza_get_status(stanza, NULL); char *status_str = stanza_get_status(stanza, NULL);
if (strcmp(my_jid->barejid, from_jid->barejid) !=0) { if (strcmp(my_jid->barejid, from_jid->barejid) !=0) {
if (from_jid->resourcepart != NULL) { if (from_jid->resourcepart) {
sv_ev_contact_offline(from_jid->barejid, from_jid->resourcepart, status_str); sv_ev_contact_offline(from_jid->barejid, from_jid->resourcepart, status_str);
// hack for servers that do not send full jid with unavailable presence // hack for servers that do not send full jid with unavailable presence
@ -495,7 +495,7 @@ _unavailable_handler(xmpp_conn_t * const conn,
sv_ev_contact_offline(from_jid->barejid, "__prof_default", status_str); sv_ev_contact_offline(from_jid->barejid, "__prof_default", status_str);
} }
} else { } else {
if (from_jid->resourcepart != NULL) { if (from_jid->resourcepart) {
connection_remove_available_resource(from_jid->resourcepart); connection_remove_available_resource(from_jid->resourcepart);
} }
} }
@ -619,7 +619,7 @@ _send_caps_request(char *node, char *caps_key, char *id, char *from)
xmpp_ctx_t *ctx = connection_get_ctx(); xmpp_ctx_t *ctx = connection_get_ctx();
xmpp_conn_t *conn = connection_get_conn(); xmpp_conn_t *conn = connection_get_conn();
if (node != NULL) { if (node) {
log_debug("Node string: %s.", node); log_debug("Node string: %s.", node);
if (!caps_contains(caps_key)) { if (!caps_contains(caps_key)) {
log_debug("Capabilities not cached for '%s', sending discovery IQ.", from); log_debug("Capabilities not cached for '%s', sending discovery IQ.", from);
@ -695,14 +695,14 @@ _muc_user_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void *
free(reason); free(reason);
// kicked from room // kicked from room
} else if (g_slist_find_custom(status_codes, "307", (GCompareFunc)g_strcmp0) != NULL) { } else if (g_slist_find_custom(status_codes, "307", (GCompareFunc)g_strcmp0)) {
char *actor = stanza_get_actor(stanza); char *actor = stanza_get_actor(stanza);
char *reason = stanza_get_reason(stanza); char *reason = stanza_get_reason(stanza);
sv_ev_room_kicked(room, actor, reason); sv_ev_room_kicked(room, actor, reason);
free(reason); free(reason);
// banned from room // banned from room
} else if (g_slist_find_custom(status_codes, "301", (GCompareFunc)g_strcmp0) != NULL) { } else if (g_slist_find_custom(status_codes, "301", (GCompareFunc)g_strcmp0)) {
char *actor = stanza_get_actor(stanza); char *actor = stanza_get_actor(stanza);
char *reason = stanza_get_reason(stanza); char *reason = stanza_get_reason(stanza);
sv_ev_room_banned(room, actor, reason); sv_ev_room_banned(room, actor, reason);
@ -740,14 +740,14 @@ _muc_user_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void *
GSList *status_codes = stanza_get_status_codes_by_ns(stanza, STANZA_NS_MUC_USER); GSList *status_codes = stanza_get_status_codes_by_ns(stanza, STANZA_NS_MUC_USER);
// kicked from room // kicked from room
if (g_slist_find_custom(status_codes, "307", (GCompareFunc)g_strcmp0) != NULL) { if (g_slist_find_custom(status_codes, "307", (GCompareFunc)g_strcmp0)) {
char *actor = stanza_get_actor(stanza); char *actor = stanza_get_actor(stanza);
char *reason = stanza_get_reason(stanza); char *reason = stanza_get_reason(stanza);
sv_ev_room_occupent_kicked(room, nick, actor, reason); sv_ev_room_occupent_kicked(room, nick, actor, reason);
free(reason); free(reason);
// banned from room // banned from room
} else if (g_slist_find_custom(status_codes, "301", (GCompareFunc)g_strcmp0) != NULL) { } else if (g_slist_find_custom(status_codes, "301", (GCompareFunc)g_strcmp0)) {
char *actor = stanza_get_actor(stanza); char *actor = stanza_get_actor(stanza);
char *reason = stanza_get_reason(stanza); char *reason = stanza_get_reason(stanza);
sv_ev_room_occupent_banned(room, nick, actor, reason); sv_ev_room_occupent_banned(room, nick, actor, reason);