X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=ed684428aba55ae848c58fe8c96af2c900f4d6b9;hp=2e0a4762bfd1e34d0f12c7a9b2d4de582c8316d4;hb=121015ff5cdbe6af7b84f6245ebe62fe2a52a859;hpb=9d8fdf8898418711558f70a9630b2444036d8285 diff --git a/blob.c b/blob.c index 2e0a4762..ed684428 100644 --- a/blob.c +++ b/blob.c @@ -262,7 +262,7 @@ static int com_rmblob_callback(struct osl_table *table, if (pmd.num_matches == 0) ret = -E_NO_MATCH; else { - para_printf(&aca->pbout, "removed %d blob(s)\n", + para_printf(&aca->pbout, "removed %u blob(s)\n", pmd.num_matches); ret = afs_event(BLOB_REMOVE, NULL, table); } @@ -487,7 +487,8 @@ static int blob_get_name_by_id(struct osl_table *table, uint32_t id, struct osl_object obj = {.data = &id, .size = sizeof(id)}; int ret; - *name = NULL; + if (name) + *name = NULL; if (!id) return 1; ret = osl(osl_get_row(table, BLOBCOL_ID, &obj, &row)); @@ -496,7 +497,10 @@ static int blob_get_name_by_id(struct osl_table *table, uint32_t id, ret = osl(osl_get_object(table, row, BLOBCOL_NAME, &obj)); if (ret < 0) return ret; - *name = (char *)obj.data; + if (*(char *)obj.data == '\0') + return -E_DUMMY_ROW; + if (name) + *name = (char *)obj.data; return 1; }