Remove struct rmatt_event_data.

It contains only an 8 bit integer, so we may as well just pass a pointer to
uint8_t instead.

3 files changed, 5 insertions, 13 deletions

diff --git a/afs.h b/afs.h
index 1f6129f1..46328602 100644
--- a/afs.h
+++ b/afs.h
@@ -70,14 +70,6 @@ enum afs_events {
 };
 
 /**
- * Structure for events of type ATTRIBUTE_REMOVE.
- */
-struct rmatt_event_data {
-	/** The bit number of the attribute being removed. */
-	unsigned char bitnum;
-};
-
-/**
  * Structure for events of type ATTRIBUTE_AFSI_CHANGE.
  */
 struct afsi_change_event_data {
diff --git a/aft.c b/aft.c
index cd4cc3a6..93d5d29b 100644
--- a/aft.c
+++ b/aft.c
@@ -2500,11 +2500,11 @@ static int aft_create(const char *dir)
 
 static int clear_attribute(struct osl_row *row, void *data)
 {
-	struct rmatt_event_data *red = data;
+	uint8_t bitnum = *(uint8_t *)data;
 	struct afs_info afsi;
 	struct osl_object obj;
 	int ret = get_afsi_object_of_row(row, &obj);
-	uint64_t mask = ~(1ULL << red->bitnum);
+	uint64_t mask = ~(1ULL << bitnum);
 
 	if (ret < 0)
 		return ret;
diff --git a/attribute.c b/attribute.c
index d80d755b..48d0baf0 100644
--- a/attribute.c
+++ b/attribute.c
@@ -292,9 +292,9 @@ static int remove_attribute(struct osl_table *table, struct osl_row *row,
 {
 	struct afs_callback_arg *aca = data;
 	int ret;
-	struct rmatt_event_data red;
+	uint8_t bitnum;
 
-	ret = get_attribute_bitnum_by_name(name, &red.bitnum);
+	ret = get_attribute_bitnum_by_name(name, &bitnum);
 	if (ret < 0) {
 		afs_error(aca, "cannot get bit number of %s\n", name);
 		return ret;
@@ -305,7 +305,7 @@ static int remove_attribute(struct osl_table *table, struct osl_row *row,
 		afs_error(aca, "cannot remove %s\n", name);
 		return ret;
 	}
-	return afs_event(ATTRIBUTE_REMOVE, &red);
+	return afs_event(ATTRIBUTE_REMOVE, &bitnum);
 }
 
 static int com_rmatt_callback(struct afs_callback_arg *aca)