X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=30c12f1ca133a0caa98ac581ca1fc31aaf5c4909;hp=d22511de76f92f19835b6c5c57faa54ba9360eab;hb=1583369f6defebc7f44249b9ce4cc01f717db3b9;hpb=8eb5a15bfcc068e8d2504bb84b14455e9fc7c3ba diff --git a/attribute.c b/attribute.c index d22511de..30c12f1c 100644 --- a/attribute.c +++ b/attribute.c @@ -127,13 +127,13 @@ static int print_attribute(struct osl_table *table, struct osl_row *row, { struct lsatt_action_data *laad = data; struct osl_object bitnum_obj; - int ret, ret2; + int ret; if (!(laad->flags & LSATT_FLAG_LONG)) return para_printf(&laad->pb, "%s\n", name); ret = osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj); if (ret < 0) { - ret2 = para_printf(&laad->pb, "%s: %s\n", name, para_strerror(-ret)); + para_printf(&laad->pb, "%s: %s\n", name, para_strerror(-ret)); return ret; } return para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data, @@ -288,7 +288,7 @@ struct addatt_event_data { static void com_addatt_callback(int fd, const struct osl_object *query) { - char *p = query->data; + char *p; int ret = 1, ret2 = 0; struct para_buffer pb = { .max_size = SHMMAX, @@ -347,7 +347,7 @@ static void com_addatt_callback(int fd, const struct osl_object *query) } out: if (ret < 0 && ret2 >= 0) - ret = para_printf(&pb, "%s: %s\n", p, para_strerror(-ret)); + para_printf(&pb, "%s: %s\n", p, para_strerror(-ret)); if (pb.offset) pass_buffer_as_shm(pb.buf, pb.offset, &fd); free(pb.buf); @@ -388,7 +388,7 @@ static void com_mvatt_callback(int fd, const struct osl_object *query) ret = osl_update_object(attribute_table, row, ATTCOL_NAME, &obj); out: if (ret < 0) - ret = para_printf(&pb, "%s\n", para_strerror(-ret)); + para_printf(&pb, "%s\n", para_strerror(-ret)); else afs_event(ATTRIBUTE_RENAME, &pb, NULL); if (pb.offset) @@ -568,8 +568,7 @@ void attribute_close(void) /** * Open the attribute table. * - * \param ti Gets initialized by this function. - * \param db The database directory. + * \param dir The database directory. * * \return Positive on success, negative on errors. *