Fix broken `priv != NULL` checks in libpurple.

The `*_get_instance_private` function just returns input value + offset,
so it is impossible for `priv` to be `NULL`.

1 files changed, 40 insertions, 37 deletions

diff --git a/libpurple/roomlist.c b/libpurple/roomlist.c
index aeaeaf4bbc..7280e55c08 100644
--- a/libpurple/roomlist.c
+++ b/libpurple/roomlist.c
@@ -94,21 +94,21 @@ void purple_roomlist_show_with_account(PurpleAccount *account)
 
 PurpleAccount *purple_roomlist_get_account(PurpleRoomlist *list)
 {
-	PurpleRoomlistPrivate *priv =
-			purple_roomlist_get_instance_private(list);
+	PurpleRoomlistPrivate *priv = NULL;
 
-	g_return_val_if_fail(priv != NULL, NULL);
+	g_return_val_if_fail(PURPLE_IS_ROOMLIST(list), NULL);
 
+	priv = purple_roomlist_get_instance_private(list);
 	return priv->account;
 }
 
 void purple_roomlist_set_fields(PurpleRoomlist *list, GList *fields)
 {
-	PurpleRoomlistPrivate *priv =
-			purple_roomlist_get_instance_private(list);
+	PurpleRoomlistPrivate *priv = NULL;
 
-	g_return_if_fail(priv != NULL);
+	g_return_if_fail(PURPLE_IS_ROOMLIST(list));
 
+	priv = purple_roomlist_get_instance_private(list);
 	priv->fields = fields;
 
 	if (ops && ops->set_fields)
@@ -119,11 +119,11 @@ void purple_roomlist_set_fields(PurpleRoomlist *list, GList *fields)
 
 void purple_roomlist_set_in_progress(PurpleRoomlist *list, gboolean in_progress)
 {
-	PurpleRoomlistPrivate *priv =
-			purple_roomlist_get_instance_private(list);
+	PurpleRoomlistPrivate *priv = NULL;
 
-	g_return_if_fail(priv != NULL);
+	g_return_if_fail(PURPLE_IS_ROOMLIST(list));
 
+	priv = purple_roomlist_get_instance_private(list);
 	priv->in_progress = in_progress;
 
 	if (ops && ops->in_progress)
@@ -134,22 +134,22 @@ void purple_roomlist_set_in_progress(PurpleRoomlist *list, gboolean in_progress)
 
 gboolean purple_roomlist_get_in_progress(PurpleRoomlist *list)
 {
-	PurpleRoomlistPrivate *priv =
-			purple_roomlist_get_instance_private(list);
+	PurpleRoomlistPrivate *priv = NULL;
 
-	g_return_val_if_fail(priv != NULL, FALSE);
+	g_return_val_if_fail(PURPLE_IS_ROOMLIST(list), FALSE);
 
+	priv = purple_roomlist_get_instance_private(list);
 	return priv->in_progress;
 }
 
 void purple_roomlist_room_add(PurpleRoomlist *list, PurpleRoomlistRoom *room)
 {
-	PurpleRoomlistPrivate *priv =
-			purple_roomlist_get_instance_private(list);
+	PurpleRoomlistPrivate *priv = NULL;
 
-	g_return_if_fail(priv != NULL);
+	g_return_if_fail(PURPLE_IS_ROOMLIST(list));
 	g_return_if_fail(room != NULL);
 
+	priv = purple_roomlist_get_instance_private(list);
 	priv->rooms = g_list_append(priv->rooms, room);
 
 	if (ops && ops->add_room)
@@ -173,15 +173,15 @@ PurpleRoomlist *purple_roomlist_get_list(PurpleConnection *gc)
 
 void purple_roomlist_cancel_get_list(PurpleRoomlist *list)
 {
-	PurpleRoomlistPrivate *priv =
-			purple_roomlist_get_instance_private(list);
+	PurpleRoomlistPrivate *priv = NULL;
 	PurpleProtocol *protocol = NULL;
 	PurpleConnection *gc;
 
-	g_return_if_fail(priv != NULL);
+	g_return_if_fail(PURPLE_IS_ROOMLIST(list));
 
-	gc = purple_account_get_connection(priv->account);
+	priv = purple_roomlist_get_instance_private(list);
 
+	gc = purple_account_get_connection(priv->account);
 	g_return_if_fail(PURPLE_IS_CONNECTION(gc));
 
 	if(gc)
@@ -193,15 +193,16 @@ void purple_roomlist_cancel_get_list(PurpleRoomlist *list)
 
 void purple_roomlist_expand_category(PurpleRoomlist *list, PurpleRoomlistRoom *category)
 {
-	PurpleRoomlistPrivate *priv =
-			purple_roomlist_get_instance_private(list);
+	PurpleRoomlistPrivate *priv = NULL;
 	PurpleProtocol *protocol = NULL;
 	PurpleConnection *gc;
 
-	g_return_if_fail(priv != NULL);
+	g_return_if_fail(PURPLE_IS_ROOMLIST(list));
 	g_return_if_fail(category != NULL);
 	g_return_if_fail(category->type & PURPLE_ROOMLIST_ROOMTYPE_CATEGORY);
 
+	priv = purple_roomlist_get_instance_private(list);
+
 	gc = purple_account_get_connection(priv->account);
 	g_return_if_fail(PURPLE_IS_CONNECTION(gc));
 
@@ -214,31 +215,31 @@ void purple_roomlist_expand_category(PurpleRoomlist *list, PurpleRoomlistRoom *c
 
 GList * purple_roomlist_get_fields(PurpleRoomlist *list)
 {
-	PurpleRoomlistPrivate *priv =
-			purple_roomlist_get_instance_private(list);
+	PurpleRoomlistPrivate *priv = NULL;
 
-	g_return_val_if_fail(priv != NULL, NULL);
+	g_return_val_if_fail(PURPLE_IS_ROOMLIST(list), NULL);
 
+	priv = purple_roomlist_get_instance_private(list);
 	return priv->fields;
 }
 
 gpointer purple_roomlist_get_protocol_data(PurpleRoomlist *list)
 {
-	PurpleRoomlistPrivate *priv =
-			purple_roomlist_get_instance_private(list);
+	PurpleRoomlistPrivate *priv = NULL;
 
-	g_return_val_if_fail(priv != NULL, NULL);
+	g_return_val_if_fail(PURPLE_IS_ROOMLIST(list), NULL);
 
+	priv = purple_roomlist_get_instance_private(list);
 	return priv->proto_data;
 }
 
 void purple_roomlist_set_protocol_data(PurpleRoomlist *list, gpointer proto_data)
 {
-	PurpleRoomlistPrivate *priv =
-			purple_roomlist_get_instance_private(list);
+	PurpleRoomlistPrivate *priv = NULL;
 
-	g_return_if_fail(priv != NULL);
+	g_return_if_fail(PURPLE_IS_ROOMLIST(list));
 
+	priv = purple_roomlist_get_instance_private(list);
 	priv->proto_data = proto_data;
 }
 
@@ -427,12 +428,13 @@ PurpleRoomlistRoom *purple_roomlist_room_new(PurpleRoomlistRoomType type, const
 
 void purple_roomlist_room_add_field(PurpleRoomlist *list, PurpleRoomlistRoom *room, gconstpointer field)
 {
-	PurpleRoomlistPrivate *priv =
-			purple_roomlist_get_instance_private(list);
+	PurpleRoomlistPrivate *priv = NULL;
 	PurpleRoomlistField *f;
 
-	g_return_if_fail(priv != NULL);
+	g_return_if_fail(PURPLE_IS_ROOMLIST(list));
 	g_return_if_fail(room != NULL);
+
+	priv = purple_roomlist_get_instance_private(list);
 	g_return_if_fail(priv->fields != NULL);
 
 	/* If this is the first call for this room, grab the first field in
@@ -462,15 +464,16 @@ void purple_roomlist_room_add_field(PurpleRoomlist *list, PurpleRoomlistRoom *ro
 
 void purple_roomlist_room_join(PurpleRoomlist *list, PurpleRoomlistRoom *room)
 {
-	PurpleRoomlistPrivate *priv =
-			purple_roomlist_get_instance_private(list);
+	PurpleRoomlistPrivate *priv = NULL;
 	GHashTable *components;
 	GList *l, *j;
 	PurpleConnection *gc;
 
-	g_return_if_fail(priv != NULL);
+	g_return_if_fail(PURPLE_IS_ROOMLIST(list));
 	g_return_if_fail(room != NULL);
 
+	priv = purple_roomlist_get_instance_private(list);
+
 	gc = purple_account_get_connection(priv->account);
 	if (!gc)
 		return;