Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us

closes #7790



committer: Gary Kramlich <grim@reaperworld.com>

1 files changed, 5 insertions, 9 deletions

diff --git a/libpurple/status.c b/libpurple/status.c
index 49aff54e55..65207a58d9 100644
--- a/libpurple/status.c
+++ b/libpurple/status.c
@@ -203,7 +203,7 @@ purple_primitive_get_type_from_id(const char *id)
 
     for (i = 0; i < PURPLE_STATUS_NUM_PRIMITIVES; i++)
     {
-        if (!strcmp(id, status_primitive_map[i].id))
+		if (purple_strequal(id, status_primitive_map[i].id))
             return status_primitive_map[i].type;
     }
 
@@ -451,7 +451,7 @@ purple_status_type_get_attr(const PurpleStatusType *status_type, const char *id)
 	{
 		PurpleStatusAttr *attr = (PurpleStatusAttr *)l->data;
 
-		if (!strcmp(purple_status_attr_get_id(attr), id))
+		if (purple_strequal(purple_status_attr_get_id(attr), id))
 			return attr;
 	}
 
@@ -477,7 +477,7 @@ purple_status_type_find_with_id(GList *status_types, const char *id)
 	{
 		status_type = status_types->data;
 
-		if (!strcmp(id, status_type->id))
+		if (purple_strequal(id, status_type->id))
 			return status_type;
 
 		status_types = status_types->next;
@@ -782,12 +782,8 @@ purple_status_set_active_with_attrs_list(PurpleStatus *status, gboolean active,
 		{
 			const gchar *string_data = l->data;
 			l = l->next;
-			if (((string_data == NULL) && (value->data.string_data == NULL)) ||
-				((string_data != NULL) && (value->data.string_data != NULL) &&
-				!strcmp(string_data, value->data.string_data)))
-			{
+			if (purple_strequal(string_data, value->data.string_data))
 				continue;
-			}
 			purple_status_set_attr_string(status, id, string_data);
 			changed = TRUE;
 		}
@@ -1451,7 +1447,7 @@ purple_presence_get_status(const PurplePresence *presence, const char *status_id
 		{
 			PurpleStatus *temp_status = l->data;
 
-			if (!strcmp(status_id, purple_status_get_id(temp_status)))
+			if (purple_strequal(status_id, purple_status_get_id(temp_status)))
 				status = temp_status;
 		}