X-Git-Url: http://git.code-monkey.de/?p=umurmur.git;a=blobdiff_plain;f=src%2Fmessages.c;h=9d98dbff88ae852b57ef3db6ed9b6e6dfc712058;hp=36bd20ccd6c236ec5dc8f4c146eefec3648e59ca;hb=0b2541420086a2e924ba5f192f36c137b958993c;hpb=06ded078a1693fb2620b3f1b4eab83e6fbfc37b5

diff --git a/src/messages.c b/src/messages.c
index 36bd20c..9d98dbf 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -452,12 +452,9 @@ void Msg_free(message_t *msg)
 		if (msg->unpacked)
 			mumble_proto__version__free_unpacked(msg->payload.version, NULL);
 		else {
-			if (msg->payload.version->release)
-				free(msg->payload.version->release);
-			if (msg->payload.version->os)
-				free(msg->payload.version->os);
-			if (msg->payload.version->os_version)
-				free(msg->payload.version->os_version);
+			free(msg->payload.version->release);
+			free(msg->payload.version->os);
+			free(msg->payload.version->os_version);
 			free(msg->payload.version);
 		}
 		break;
@@ -502,14 +499,10 @@ void Msg_free(message_t *msg)
 		if (msg->unpacked)
 			mumble_proto__text_message__free_unpacked(msg->payload.textMessage, NULL);
 		else {
-			if (msg->payload.textMessage->message)
-				free(msg->payload.textMessage->message);
-			if (msg->payload.textMessage->session)
-				free(msg->payload.textMessage->session);
-			if (msg->payload.textMessage->channel_id)
-				free(msg->payload.textMessage->channel_id);
-			if (msg->payload.textMessage->tree_id)
-				free(msg->payload.textMessage->tree_id);
+			free(msg->payload.textMessage->message);
+			free(msg->payload.textMessage->session);
+			free(msg->payload.textMessage->channel_id);
+			free(msg->payload.textMessage->tree_id);
 			free(msg->payload.textMessage);
 		}
 		break;
@@ -547,12 +540,9 @@ void Msg_free(message_t *msg)
 		if (msg->unpacked)
 			mumble_proto__channel_state__free_unpacked(msg->payload.channelState, NULL);
 		else {
-			if (msg->payload.channelState->name)
-				free(msg->payload.channelState->name);
-			if (msg->payload.channelState->description)
-				free(msg->payload.channelState->description);
-			if (msg->payload.channelState->links)
-				free(msg->payload.channelState->links);
+			free(msg->payload.channelState->name);
+			free(msg->payload.channelState->description);
+			free(msg->payload.channelState->links);
 			free(msg->payload.channelState);
 		}
 		break;
@@ -595,29 +585,20 @@ void Msg_free(message_t *msg)
 		if (msg->unpacked)
 			mumble_proto__user_stats__free_unpacked(msg->payload.userStats, NULL);
 		else {
-			if (msg->payload.userStats->from_client)
-				free(msg->payload.userStats->from_client);
-			if (msg->payload.userStats->from_server)
-				free(msg->payload.userStats->from_server);
+			free(msg->payload.userStats->from_client);
+			free(msg->payload.userStats->from_server);
 			if (msg->payload.userStats->version) {
-				if (msg->payload.userStats->version->release)
-					free(msg->payload.userStats->version->release);
-				if (msg->payload.userStats->version->os)
-					free(msg->payload.userStats->version->os);
-				if (msg->payload.userStats->version->os_version)
-					free(msg->payload.userStats->version->os_version);
-
+				free(msg->payload.userStats->version->release);
+				free(msg->payload.userStats->version->os);
+				free(msg->payload.userStats->version->os_version);
 				free(msg->payload.userStats->version);
 			}
-			if (msg->payload.userStats->celt_versions)
-				free(msg->payload.userStats->celt_versions);
+			free(msg->payload.userStats->celt_versions);
 			if (msg->payload.userStats->certificates) {
-				if (msg->payload.userStats->certificates->data)
-					free(msg->payload.userStats->certificates->data);
+				free(msg->payload.userStats->certificates->data);
 				free(msg->payload.userStats->certificates);
 			}
-			if (msg->payload.userStats->address.data)
-				free(msg->payload.userStats->address.data);
+			free(msg->payload.userStats->address.data);
 
 			free(msg->payload.userStats);
 		}