X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=001026db4e956caa8b46256797d29cddced6ddf5;hp=d843692934df671684d383ba4ec59996659ef75e;hb=4a33aa7ad93857d0c6b5ea24983e12b1619b10c0;hpb=01cd3e6d1e3ebbb585d5dc9a4272633dc2eeb31d

diff --git a/aft.c b/aft.c
index d8436929..001026db 100644
--- a/aft.c
+++ b/aft.c
@@ -2004,11 +2004,14 @@ int com_touch(int fd, int argc, char * const * const argv)
 		return -E_AFT_SYNTAX;
 	ret = send_option_arg_callback_request(&query, argc - i,
 		argv + i, com_touch_callback, &result);
-	if (ret > 0) {
-		send_buffer(fd, (char *)result.data);
-		free(result.data);
-	} else if (ret < 0)
+	if (!ret)
+		return 0;
+	if (ret < 0) {
 		send_va_buffer(fd, "%s\n", para_strerror(-ret));
+		return ret;
+	}
+	ret = send_buffer(fd, (char *)result.data);
+	free(result.data);
 	return ret;
 }
 
@@ -2116,11 +2119,14 @@ int com_rm(int fd, int argc,  char * const * const argv)
 		return -E_AFT_SYNTAX;
 	ret = send_option_arg_callback_request(&query, argc - i, argv + i,
 		com_rm_callback, &result);
-	if (ret > 0) {
-		send_buffer(fd, (char *)result.data);
-		free(result.data);
-	} else if (ret < 0)
+	if (!ret)
+		return 0;
+	if (ret < 0) {
 		send_va_buffer(fd, "%s\n", para_strerror(-ret));
+		return ret;
+	}
+	ret = send_buffer(fd, (char *)result.data);
+	free(result.data);
 	return ret;
 }
 
@@ -2277,11 +2283,14 @@ int com_cpsi(int fd, int argc,  char * const * const argv)
 		flags = ~(unsigned)CPSI_FLAG_VERBOSE | flags;
 	ret = send_option_arg_callback_request(&options, argc - i, argv + i,
 		com_cpsi_callback, &result);
-	if (ret > 0) {
-		send_buffer(fd, (char *)result.data);
-		free(result.data);
-	} else
+	if (!ret)
+		return 0;
+	if (ret < 0) {
 		send_va_buffer(fd, "%s\n", para_strerror(-ret));
+		return ret;
+	}
+	ret = send_buffer(fd, (char *)result.data);
+	free(result.data);
 	return ret;
 }