From: Andre Noll Date: Wed, 5 Sep 2018 15:32:58 +0000 (+0200) Subject: blob.c: Trivial whitespace fixes. X-Git-Tag: v0.6.3~76 X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=af228cfb66651b0ad846a9b2777a356dd0816871;p=paraslash.git blob.c: Trivial whitespace fixes. --- diff --git a/blob.c b/blob.c index 890b9226..56986131 100644 --- a/blob.c +++ b/blob.c @@ -72,7 +72,6 @@ static struct osl_column_description blob_cols[] = { /** Define a pointer to an osl blob table with a canonical name. */ #define DEFINE_BLOB_TABLE_PTR(table_name) struct osl_table *table_name ## _table; - /** Define a blob table. */ #define INIT_BLOB_TABLE(table_name) \ DEFINE_BLOB_TABLE_DESC(table_name); \ @@ -121,6 +120,7 @@ static int com_lsblob_callback(const struct lls_command * const cmd, .action = print_blob, }; int ret; + ret = lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr); pmd.lpr = aca->lpr; assert(ret >= 0); @@ -176,6 +176,7 @@ static int com_catblob_callback(const struct lls_command * const cmd, .data = &aca->fd, .action = cat_blob }; + ret = lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr); assert(ret >= 0); pmd.lpr = aca->lpr; @@ -207,6 +208,7 @@ static int remove_blob(struct osl_table *table, struct osl_row *row, { struct afs_callback_arg *aca = data; int ret = osl(osl_del_row(table, row)); + if (ret < 0) { para_printf(&aca->pbout, "cannot remove %s\n", name); return ret; @@ -226,6 +228,7 @@ static int com_rmblob_callback(const struct lls_command * const cmd, .data = aca, .action = remove_blob }; + ret = lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr); assert(ret >= 0); pmd.lpr = aca->lpr; @@ -509,7 +512,6 @@ static int blob_get_name_by_id(struct osl_table *table, uint32_t id, return blob_get_name_by_id(table_name ## _table, id, name); \ } - static int blob_get_def_by_name(struct osl_table *table, char *name, struct osl_object *def) { @@ -561,6 +563,7 @@ static int blob_get_name_and_def_by_row(struct osl_table *table, { struct osl_object obj; int ret = osl(osl_get_object(table, row, BLOBCOL_NAME, &obj)); + if (ret < 0) return ret; *name = obj.data; @@ -596,6 +599,7 @@ static int blob_open(struct osl_table **table, const char *dir) { int ret; + desc->dir = dir; ret = osl(osl_open_table(desc, table)); if (ret >= 0)