X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=5ab5c1ce48fafd5ad3cbf4b0189202ef34aaa996;hp=1742ac427c85e6e7cc35becc9cfbe508e45bf750;hb=0dd69d3988a677aeb8d0d3aea8364c664ac35fb9;hpb=002731cd3938f3be6b71651e56c062af1adcdec0

diff --git a/blob.c b/blob.c
index 1742ac42..5ab5c1ce 100644
--- a/blob.c
+++ b/blob.c
@@ -67,13 +67,13 @@ static int print_blob(struct osl_table *table, struct osl_row *row,
 	struct lsblob_action_data *lbad = data;
 	struct osl_object obj;
 	uint32_t id;
-	int ret, ret2;
+	int ret;
 
 	if (!(lbad->flags & BLOB_LS_FLAG_LONG))
 		return para_printf(&lbad->pb, "%s\n", name);
 	ret = osl_get_object(table, row, BLOBCOL_ID, &obj);
 	if (ret < 0) {
-		ret2 = para_printf(&lbad->pb, "%s: %s\n", name, para_strerror(-ret));
+		para_printf(&lbad->pb, "%s: %s\n", name, para_strerror(-ret));
 		return ret;
 	}
 	id = *(uint32_t *)obj.data;
@@ -110,7 +110,7 @@ static void com_lsblob_callback(struct osl_table *table,
 		pmd.loop_col_num = BLOBCOL_ID;
 	ret = for_each_matching_row(&pmd);
 	if (ret < 0)
-		ret = para_printf(&lbad.pb, "%s\n", para_strerror(-ret));
+		para_printf(&lbad.pb, "%s\n", para_strerror(-ret));
 	if (lbad.pb.offset)
 		pass_buffer_as_shm(lbad.pb.buf, lbad.pb.offset, &fd);
 	free(lbad.pb.buf);
@@ -200,9 +200,9 @@ static int remove_blob(struct osl_table *table, struct osl_row *row,
 		const char *name, void *data)
 {
 	struct rmblob_data *rmbd = data;
-	int ret = osl_del_row(table, row), ret2;
+	int ret = osl_del_row(table, row);
 	if (ret < 0) {
-		ret2 = para_printf(&rmbd->pb, "%s: %s\n", name, para_strerror(-ret));
+		para_printf(&rmbd->pb, "%s: %s\n", name, para_strerror(-ret));
 		return ret;
 	}
 	rmbd->num_removed++;
@@ -477,7 +477,7 @@ static int blob_get_name_and_def_by_row(struct osl_table *table,
 
 /** Define the \p close function for this blob type. */
 #define DEFINE_BLOB_CLOSE(table_name) \
-	void table_name ## _close(void) \
+	static void table_name ## _close(void) \
 	{ \
 		osl_close_table(table_name ## _table, OSL_MARK_CLEAN); \
 		table_name ## _table = NULL; \
@@ -485,7 +485,7 @@ static int blob_get_name_and_def_by_row(struct osl_table *table,
 
 /** Define the \p create function for this blob type. */
 #define DEFINE_BLOB_CREATE(table_name) \
-	int table_name ## _create(const char *dir) \
+	static int table_name ## _create(const char *dir) \
 	{ \
 		table_name ## _table_desc.dir = dir; \
 		return osl_create_table(&table_name ## _table_desc); \
@@ -507,7 +507,7 @@ static int blob_open(struct osl_table **table,
 }
 
 #define DEFINE_BLOB_OPEN(table_name) \
-	int table_name ## _open(const char *dir) \
+	static int table_name ## _open(const char *dir) \
 	{ \
 		return blob_open(&table_name ## _table, \
 			&table_name ## _table_desc, dir); \
@@ -518,7 +518,6 @@ static int blob_open(struct osl_table **table,
 #define DEFINE_BLOB_INIT(table_name) \
 	void table_name ## _init(struct afs_table *t) \
 	{ \
-		t->name = table_name ## _table_desc.name; \
 		t->open = table_name ## _open; \
 		t->close = table_name ## _close; \
 		t->create = table_name ## _create;\