X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=attribute.c;h=ec2eae73ab9c59297bd0d0df14062579ff06e26b;hb=b2e6a24448a9e49e0766ab4f32163580eeff469e;hp=cce8ce6e03bd9aef9d675de1ef79a983a294413b;hpb=d9c8f984833cc51d5570987462558b2cfb7588b8;p=paraslash.git

diff --git a/attribute.c b/attribute.c
index cce8ce6e..ec2eae73 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,
@@ -317,7 +317,7 @@ static void com_addatt_callback(int fd, const struct osl_object *query)
 				goto out;
 			continue;
 		}
-		if (ret != -E_RB_KEY_NOT_FOUND) /* error */
+		if (ret != -E_OSL_RB_KEY_NOT_FOUND) /* error */
 			goto out;
 		objs[ATTCOL_BITNUM].size = 1;
 		/* find smallest unused attribute */
@@ -325,7 +325,7 @@ static void com_addatt_callback(int fd, const struct osl_object *query)
 			objs[ATTCOL_BITNUM].data = &bitnum;
 			ret = osl_get_row(attribute_table, ATTCOL_BITNUM,
 				&objs[ATTCOL_BITNUM], &row);
-			if (ret == -E_RB_KEY_NOT_FOUND)
+			if (ret == -E_OSL_RB_KEY_NOT_FOUND)
 				break; /* this bitnum is unused, use it */
 			if (ret < 0) /* error */
 				goto out;
@@ -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)