From: Andre <maan@p133.(none)>
Date: Mon, 24 Apr 2006 14:15:02 +0000 (+0200)
Subject: minor mysql_selector cleanup.
X-Git-Tag: v0.2.12~27
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=e2630b3d4a712faca04be918d4ee12eae5a13ff4

minor mysql_selector cleanup.

make_message() never returns NULL, so remove the check.
---

diff --git a/mysql_selector.c b/mysql_selector.c
index ff94d8d7..ff299cdf 100644
--- a/mysql_selector.c
+++ b/mysql_selector.c
@@ -1840,10 +1840,10 @@ static int update_audio_file(char *name)
 	ret = real_query(q);
 	free(q);
 out:
-	if (ebn)
-		free(ebn);
+	free(ebn);
 	return ret;
 }
+
 /* If called as child, mmd_lock must be held */
 static void update_mmd(char *info)
 {
@@ -2420,9 +2420,8 @@ static char **server_get_audio_file_list(unsigned int num)
 	free(stream);
 	query = make_message("%s limit %d", tmp, num);
 	free(tmp);
-	if (!query)
-		goto err_out;
 	result = get_result(query);
+	free(query);
 	if (!result)
 		goto err_out;
 	num_rows = mysql_num_rows(result);
@@ -2444,8 +2443,6 @@ err_out:
 	free(list);
 	list = NULL;
 success:
-	if (query)
-		free(query);
 	if (result)
 		mysql_free_result(result);
 	return list;