X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;fp=blob.c;h=4f4a034ad2d60c2e67856050671713738459c828;hp=3073bf0098f8d5f4a9334453ad86f638caff8085;hb=2edd5e54e7443ed42d4c4e56c2efb242956f818b;hpb=df163841b20a7ef51190cc9e05cdc0cc80ce5b8a

diff --git a/blob.c b/blob.c
index 3073bf00..4f4a034a 100644
--- a/blob.c
+++ b/blob.c
@@ -116,15 +116,18 @@ static int print_blob(struct osl_table *table, struct osl_row *row,
 	uint32_t id;
 	int ret;
 
-	if (!(lbad->flags & BLOB_LS_FLAG_LONG))
-		return para_printf(&lbad->pb, "%s\n", name);
+	if (!(lbad->flags & BLOB_LS_FLAG_LONG)) {
+		para_printf(&lbad->pb, "%s\n", name);
+		return 0;
+	}
 	ret = osl(osl_get_object(table, row, BLOBCOL_ID, &obj));
 	if (ret < 0) {
 		para_printf(&lbad->pb, "%s: %s\n", name, para_strerror(-ret));
 		return ret;
 	}
 	id = *(uint32_t *)obj.data;
-	return para_printf(&lbad->pb, "%u\t%s\n", id, name);
+	para_printf(&lbad->pb, "%u\t%s\n", id, name);
+	return 1;
 }
 
 static void com_lsblob_callback(struct osl_table *table,
@@ -265,7 +268,7 @@ static int remove_blob(struct osl_table *table, struct osl_row *row,
 static void com_rmblob_callback(struct osl_table *table, int fd,
 		const struct osl_object *query)
 {
-	int ret, ret2 = 0;
+	int ret;
 	struct rmblob_data rmbd = {
 		.pb = {
 			.max_size = shm_get_shmmax(),
@@ -286,19 +289,15 @@ static void com_rmblob_callback(struct osl_table *table, int fd,
 		.action = remove_blob
 	};
 	ret = for_each_matching_row(&pmd);
-	if (ret < 0) {
-		ret2 = para_printf(&rmbd.pb, "%s\n", para_strerror(-ret));
-		if (ret2 < 0)
-			goto out;
-	}
+	if (ret < 0)
+		para_printf(&rmbd.pb, "%s\n", para_strerror(-ret));
 	if (pmd.num_matches == 0)
-		ret2 = para_printf(&rmbd.pb, "no matches, nothing removed\n");
+		para_printf(&rmbd.pb, "no matches, nothing removed\n");
 	else {
-		ret2 = para_printf(&rmbd.pb, "removed %d blobs\n", pmd.num_matches);
+		para_printf(&rmbd.pb, "removed %d blobs\n", pmd.num_matches);
 		afs_event(BLOB_RENAME, NULL, table);
 	}
-out:
-	if (ret2 >= 0 && rmbd.pb.offset)
+	if (rmbd.pb.offset)
 		pass_buffer_as_shm(fd, SBD_OUTPUT, rmbd.pb.buf, rmbd.pb.offset);
 	free(rmbd.pb.buf);
 }