Skip to contentSkip to conversation

libsepol: use explicit type for function parameters

PATCH In review Christian Göttsche 2 participants 3 messages Jul 14, 2023 – Aug 7, 2023 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libsepol: use explicit type for function parameters

Use a pointer to the explicit type struct policy_file instead of void for increased type safety and readability.

---
 libsepol/include/sepol/policydb/avtab.h | 2 +-
 libsepol/src/avtab.c                    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
libsepol/include/sepol/policydb/avtab.h +1 -1
index 7d892879..2bb583f5 100644
@@ -158,7 +158,7 @@ extern int avtab_insert_filename_trans(avtab_t *a, avtab_key_t *key,
 				       uint32_t otype, const char *name,
 				       uint8_t name_match,
 				       uint32_t *present_otype);
-extern int avtab_filename_trans_read(void *fp, uint32_t vers, avtab_t *a);
+extern int avtab_filename_trans_read(struct policy_file *fp, uint32_t vers, avtab_t *a);
 
 #ifdef __cplusplus
 }
libsepol/src/avtab.c +3 -3
index 99fdaa87..7a35fc17 100644
@@ -843,7 +843,7 @@ bad:
 	return rc;
 }
 
-static int filename_trans_read_one(avtab_t *a, void *fp)
+static int filename_trans_read_one(avtab_t *a, struct policy_file *fp)
 {
 	int rc;
 	uint32_t buf[4], len, otype;
@@ -882,7 +882,7 @@ err:
 	return SEPOL_ERR;
 }
 
-static int filename_trans_comp_read_one(avtab_t *a, void *fp)
+static int filename_trans_comp_read_one(avtab_t *a, struct policy_file *fp)
 {
 	int rc;
 	uint32_t buf[3], len, ndatum, i, bit, otype;
@@ -941,7 +941,7 @@ err:
 	return rc;
 }
 
-int avtab_filename_trans_read(void *fp, uint32_t vers, avtab_t *a)
+int avtab_filename_trans_read(struct policy_file *fp, uint32_t vers, avtab_t *a)
 {
 	uint32_t buf[1], nel, i;
 	int rc;
Signature · 1 line
2.40.1
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Christian Göttsche

Use a pointer to the explicit type struct policy_file instead of void for increased type safety and readability.

Quoted 52 lines
---
 libsepol/include/sepol/policydb/avtab.h | 2 +-
 libsepol/src/avtab.c                    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
libsepol/include/sepol/policydb/avtab.h +1 -1
index 7d892879..2bb583f5 100644
@@ -158,7 +158,7 @@ extern int avtab_insert_filename_trans(avtab_t *a, avtab_key_t *key,
                                       uint32_t otype, const char *name,
                                       uint8_t name_match,
                                       uint32_t *present_otype);
-extern int avtab_filename_trans_read(void *fp, uint32_t vers, avtab_t *a);
+extern int avtab_filename_trans_read(struct policy_file *fp, uint32_t vers, avtab_t *a);
 
 #ifdef __cplusplus
 }
libsepol/src/avtab.c +3 -4
index 99fdaa87..7a35fc17 100644
@@ -843,7 +843,7 @@ bad:
        return rc;
 }
 
-static int filename_trans_read_one(avtab_t *a, void *fp)
+static int filename_trans_read_one(avtab_t *a, struct policy_file *fp)
 {
        int rc;
        uint32_t buf[4], len, otype;
@@ -882,7 +882,7 @@ err:
        return SEPOL_ERR;
 }
 
-static int filename_trans_comp_read_one(avtab_t *a, void *fp)
+static int filename_trans_comp_read_one(avtab_t *a, struct policy_file *fp)
 {
        int rc;
        uint32_t buf[3], len, ndatum, i, bit, otype;
@@ -941,7 +941,7 @@ err:
        return rc;
 }
 
-int avtab_filename_trans_read(void *fp, uint32_t vers, avtab_t *a)
+int avtab_filename_trans_read(struct policy_file *fp, uint32_t vers, avtab_t *a)
 {
        uint32_t buf[1], nel, i;
        int rc;
--

2.40.1

#2 lore raw
Quoted 11 lines · James Carter
Quoted 5 lines · Christian Göttsche

Use a pointer to the explicit type struct policy_file instead of void for increased type safety and readability.

This patch was for the prefix/suffix patches, so it is no longer applicable. Jim

Quoted 52 lines
Quoted 52 lines
---
 libsepol/include/sepol/policydb/avtab.h | 2 +-
 libsepol/src/avtab.c                    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
libsepol/include/sepol/policydb/avtab.h +1 -1
index 7d892879..2bb583f5 100644
@@ -158,7 +158,7 @@ extern int avtab_insert_filename_trans(avtab_t *a, avtab_key_t *key,
                                       uint32_t otype, const char *name,
                                       uint8_t name_match,
                                       uint32_t *present_otype);
-extern int avtab_filename_trans_read(void *fp, uint32_t vers, avtab_t *a);
+extern int avtab_filename_trans_read(struct policy_file *fp, uint32_t vers, avtab_t *a);
 
 #ifdef __cplusplus
 }
libsepol/src/avtab.c +3 -4
index 99fdaa87..7a35fc17 100644
@@ -843,7 +843,7 @@ bad:
        return rc;
 }
 
-static int filename_trans_read_one(avtab_t *a, void *fp)
+static int filename_trans_read_one(avtab_t *a, struct policy_file *fp)
 {
        int rc;
        uint32_t buf[4], len, otype;
@@ -882,7 +882,7 @@ err:
        return SEPOL_ERR;
 }
 
-static int filename_trans_comp_read_one(avtab_t *a, void *fp)
+static int filename_trans_comp_read_one(avtab_t *a, struct policy_file *fp)
 {
        int rc;
        uint32_t buf[3], len, ndatum, i, bit, otype;
@@ -941,7 +941,7 @@ err:
        return rc;
 }
 
-int avtab_filename_trans_read(void *fp, uint32_t vers, avtab_t *a)
+int avtab_filename_trans_read(struct policy_file *fp, uint32_t vers, avtab_t *a)
 {
        uint32_t buf[1], nel, i;
        int rc;
--

2.40.1