X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=ae2cbe2a1e8f756004f7fa69ef1f84d53e375c10;hp=1d2d6d8dae69d152df2d9db6ec05988c4cac7f5b;hb=5a63e05ac5239109f7bd492a71575ad1644d0c41;hpb=73299ebf0a43f0cbf299585f0d5d6ff09e3b93eb

diff --git a/aft.c b/aft.c
index 1d2d6d8d..ae2cbe2a 100644
--- a/aft.c
+++ b/aft.c
@@ -493,15 +493,16 @@ static int aft_get_row_of_hash(unsigned char *hash, struct osl_row **row)
 	return osl(osl_get_row(audio_file_table, AFTCOL_HASH, &obj, row));
 }
 
-/**
- * Get the osl object holding the audio file selector info of a row.
+/*
+ * Get the audio file selector info object of a row.
  *
  * \param row Pointer to a row in the audio file table.
  * \param obj Result pointer.
  *
  * \return Standard.
  */
-int get_afsi_object_of_row(const struct osl_row *row, struct osl_object *obj)
+static int get_afsi_object_of_row(const struct osl_row *row,
+		struct osl_object *obj)
 {
 	return osl(osl_get_object(audio_file_table, row, AFTCOL_AFSI, obj));
 }
@@ -1876,12 +1877,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. */
@@ -1901,12 +1898,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;
 	}
 	/*
@@ -1923,12 +1916,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;
 	}
@@ -1943,14 +1932,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. */
@@ -1994,11 +1977,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;
@@ -2006,14 +1985,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;
@@ -2025,12 +1999,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;
 		}