X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=0cc2bd070e42e2ac2ed25f89504b6434cc54bea2;hp=2732790938442822e983205a164cc5f09185a049;hb=277ed4a605f68118aff9e671f16c0ac6edb1d55a;hpb=7dc1b56764191dab6aedf360c7a6d648fa49a37c

diff --git a/aft.c b/aft.c
index 27327909..0cc2bd07 100644
--- a/aft.c
+++ b/aft.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -1277,8 +1277,10 @@ static int prepare_ls_row(struct osl_row *row, void *ls_opts)
 		ret = get_score_and_aft_row(row, &score, &aft_row);
 		if (ret < 0)
 			return ret;
-	} else
+	} else {
 		aft_row = row;
+		score = 0;
+	}
 	ret = get_audio_file_path_of_row(aft_row, &path);
 	if (ret < 0)
 		return ret;
@@ -1874,12 +1876,8 @@ static int add_one_audio_file(const char *path, void *private_data)
 	ret = 1;
 	if (pb && (pad->flags & ADD_FLAG_LAZY)) { /* lazy is really cheap */
 		if (pad->flags & ADD_FLAG_VERBOSE)
-			send_ret = pad->cc->use_sideband?
-				send_sb_va(&pad->cc->scc, SBD_OUTPUT,
-					"lazy-ignore: %s\n", path)
-			:
-				sc_send_va_buffer(&pad->cc->scc,
-					"lazy-ignore: %s\n", path);
+			send_ret = send_sb_va(&pad->cc->scc, SBD_OUTPUT,
+				"lazy-ignore: %s\n", path);
 		goto out_free;
 	}
 	/* We still want to add this file. Compute its hash. */
@@ -1899,12 +1897,8 @@ static int add_one_audio_file(const char *path, void *private_data)
 	ret = 1;
 	if (pb && hs && hs == pb && !(pad->flags & ADD_FLAG_FORCE)) {
 		if (pad->flags & ADD_FLAG_VERBOSE)
-			send_ret = pad->cc->use_sideband?
-				send_sb_va(&pad->cc->scc, SBD_OUTPUT,
-					"%s exists, not forcing update\n", path)
-			:
-				sc_send_va_buffer(&pad->cc->scc,
-					"%s exists, not forcing update\n", path);
+			send_ret = send_sb_va(&pad->cc->scc, SBD_OUTPUT,
+				"%s exists, not forcing update\n", path);
 		goto out_unmap;
 	}
 	/*
@@ -1921,12 +1915,8 @@ static int add_one_audio_file(const char *path, void *private_data)
 	munmap(map.data, map.size);
 	close(fd);
 	if (pad->flags & ADD_FLAG_VERBOSE) {
-		send_ret = pad->cc->use_sideband?
-			send_sb_va(&pad->cc->scc, SBD_OUTPUT,
-				"adding %s\n", path)
-		:
-			sc_send_va_buffer(&pad->cc->scc,
-				"adding %s\n", path);
+		send_ret = send_sb_va(&pad->cc->scc, SBD_OUTPUT,
+			"adding %s\n", path);
 		if (send_ret < 0)
 			goto out_free;
 	}
@@ -1941,14 +1931,8 @@ out_unmap:
 	munmap(map.data, map.size);
 out_free:
 	if (ret < 0 && send_ret >= 0)
-		send_ret = pad->cc->use_sideband?
-			send_sb_va(&pad->cc->scc, SBD_ERROR_LOG,
-				"failed to add %s (%s)\n", path,
-				para_strerror(-ret))
-		:
-			sc_send_va_buffer(&pad->cc->scc,
-				"failed to add %s (%s)\n", path,
-				para_strerror(-ret));
+		send_ret = send_sb_va(&pad->cc->scc, SBD_ERROR_LOG,
+			"failed to add %s (%s)\n", path, para_strerror(-ret));
 	free(obj.data);
 	clear_afhi(afhi_ptr);
 	/* Stop adding files only on send errors. */
@@ -1992,11 +1976,7 @@ int com_add(struct command_context *cc)
 		char *path;
 		ret = verify_path(cc->argv[i], &path);
 		if (ret < 0) {
-			ret = cc->use_sideband?
-				send_sb_va(&cc->scc, SBD_ERROR_LOG, "%s: %s\n",
-				cc->argv[i], para_strerror(-ret))
-			:
-				sc_send_va_buffer(&cc->scc, "%s: %s\n",
+			ret = send_sb_va(&cc->scc, SBD_ERROR_LOG, "%s: %s\n",
 				cc->argv[i], para_strerror(-ret));
 			if (ret < 0)
 				return ret;
@@ -2004,14 +1984,9 @@ int com_add(struct command_context *cc)
 		}
 		ret = stat(path, &statbuf);
 		if (ret < 0) {
-			ret = cc->use_sideband?
-				send_sb_va(&cc->scc, SBD_ERROR_LOG,
-					"failed to stat %s (%s)\n", path,
-					strerror(errno))
-				:
-				sc_send_va_buffer(&cc->scc,
-					"failed to stat %s (%s)\n", path,
-					strerror(errno));
+			ret = send_sb_va(&cc->scc, SBD_ERROR_LOG,
+				"failed to stat %s (%s)\n", path,
+				strerror(errno));
 			free(path);
 			if (ret < 0)
 				return ret;
@@ -2023,12 +1998,8 @@ int com_add(struct command_context *cc)
 		else
 			ret = add_one_audio_file(path, &pad);
 		if (ret < 0) {
-			if (cc->use_sideband)
-				send_sb_va(&cc->scc, SBD_OUTPUT, "%s: %s\n", path,
-					para_strerror(-ret));
-			else
-				sc_send_va_buffer(&cc->scc, "%s: %s\n", path,
-					para_strerror(-ret));
+			send_sb_va(&cc->scc, SBD_OUTPUT, "%s: %s\n", path,
+				para_strerror(-ret));
 			free(path);
 			return ret;
 		}