X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=blob.c;h=b3daf5c35744c5727ab8a8f52f127b83c1454073;hb=a5842a27e24fae1053b23ef51777564e87adb395;hp=707c6c6254b88a359a5297c469a1f3105528e5bc;hpb=4a0c8e1fb760134609dcf2c06cd1b9b76953d606;p=paraslash.git diff --git a/blob.c b/blob.c index 707c6c62..b3daf5c3 100644 --- a/blob.c +++ b/blob.c @@ -238,8 +238,6 @@ static int com_catblob(callback_function *f, struct stream_cipher_context *scc, struct rmblob_data { /** Message buffer. */ struct para_buffer pb; - /** Number of removed blobs. */ - unsigned num_removed; }; static int remove_blob(struct osl_table *table, struct osl_row *row, @@ -251,7 +249,6 @@ static int remove_blob(struct osl_table *table, struct osl_row *row, para_printf(&rmbd->pb, "%s: %s\n", name, para_strerror(-ret)); return ret; } - rmbd->num_removed++; return 1; } @@ -260,7 +257,6 @@ static void com_rmblob_callback(struct osl_table *table, int fd, { int ret, ret2 = 0; struct rmblob_data rmbd = { - .num_removed = 0, .pb = { .max_size = shm_get_shmmax(), .private_data = &fd, @@ -282,10 +278,10 @@ static void com_rmblob_callback(struct osl_table *table, int fd, if (ret2 < 0) goto out; } - if (!rmbd.num_removed) + if (pmd.num_matches == 0) ret2 = para_printf(&rmbd.pb, "no matches, nothing removed\n"); else { - ret2 = para_printf(&rmbd.pb, "removed %d blobs\n", rmbd.num_removed); + ret2 = para_printf(&rmbd.pb, "removed %d blobs\n", pmd.num_matches); afs_event(BLOB_RENAME, NULL, table); } out: