X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=92332272970d48bda5fa073cb4acf7c7792415ad;hp=fd8ddc801ccce343914a2845c1b0c0c96c5b7d6c;hb=33a282ec9378ca6b2d0707c6e9642a3e6b625cb4;hpb=40de1dd2fdbb054444d585aa70e2d50166a66e07 diff --git a/blob.c b/blob.c index fd8ddc80..92332272 100644 --- a/blob.c +++ b/blob.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Andre Noll + * Copyright (C) 2007-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -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++; @@ -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;\