X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mysql_selector.c;h=8d043f5ae4759b21487a30916155df8275aeff3d;hp=ff94d8d7c26e5cc8fcd1095a6e1eb85e17c3a348;hb=9c0fedbedd284d4c76d785b6243fc2027344242d;hpb=e0e5a7c1a04c6a2ee4a475e823657e06e6df2f99

diff --git a/mysql_selector.c b/mysql_selector.c
index ff94d8d7..8d043f5a 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)
 {
@@ -2366,7 +2366,7 @@ static int com_upd(int fd, int argc, __a_unused char *argv[])
 		goto out;
 	if ((ret = real_query("delete from dir")) < 0)
 		goto out;
-	query = make_message("load data infile '%s' into table dir "
+	query = make_message("load data infile '%s' ignore into table dir "
 		"fields terminated by '\t' lines terminated by '\n' "
 		"(dir, name)", tempname);
 	ret = real_query(query);
@@ -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;