X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=30c12f1ca133a0caa98ac581ca1fc31aaf5c4909;hp=cce8ce6e03bd9aef9d675de1ef79a983a294413b;hb=3781a3df94ce9bb28c98369df7a140fb4c086c23;hpb=48d037e4ff6f055f1b01dc7ae3d0c778c30821bf diff --git a/attribute.c b/attribute.c index cce8ce6e..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)