diff mbox series

libsepol: constify function pointer arrays

Message ID 20240402154238.104378-1-cgoettsche@seltendoof.de (mailing list archive)
State Accepted
Commit e81a05a50503
Delegated to: Petr Lautrbach
Headers show
Series libsepol: constify function pointer arrays | expand

Commit Message

Christian Göttsche April 2, 2024, 3:42 p.m. UTC 
From: Christian Göttsche <cgzones@googlemail.com>

The function pointer arrays are never changed, declare them const.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
 libsepol/src/policydb.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

James Carter April 3, 2024, 7:51 p.m. UTC | #1 
On Tue, Apr 2, 2024 at 11:46 AM Christian Göttsche
<cgoettsche@seltendoof.de> wrote:
>
> From: Christian Göttsche <cgzones@googlemail.com>
>
> The function pointer arrays are never changed, declare them const.
>
> Signed-off-by: Christian Göttsche <cgzones@googlemail.com>

Acked-by: James Carter <jwcart2@gmail.com>

> ---
>  libsepol/src/policydb.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libsepol/src/policydb.c b/libsepol/src/policydb.c
> index 0c23a7a2..49f9e8af 100644
> --- a/libsepol/src/policydb.c
> +++ b/libsepol/src/policydb.c
> @@ -1126,7 +1126,7 @@ static int cat_index(hashtab_key_t key, hashtab_datum_t datum, void *datap)
>         return 0;
>  }
>
> -static int (*index_f[SYM_NUM]) (hashtab_key_t key, hashtab_datum_t datum,
> +static int (*const index_f[SYM_NUM]) (hashtab_key_t key, hashtab_datum_t datum,
>                                 void *datap) = {
>  common_index, class_index, role_index, type_index, user_index,
>             cond_index_bool, sens_index, cat_index,};
> @@ -1409,7 +1409,7 @@ static int cat_destroy(hashtab_key_t key, hashtab_datum_t datum, void *p
>         return 0;
>  }
>
> -static int (*destroy_f[SYM_NUM]) (hashtab_key_t key, hashtab_datum_t datum,
> +static int (*const destroy_f[SYM_NUM]) (hashtab_key_t key, hashtab_datum_t datum,
>                                   void *datap) = {
>  common_destroy, class_destroy, role_destroy, type_destroy, user_destroy,
>             cond_destroy_bool, sens_destroy, cat_destroy,};
> @@ -3410,7 +3410,7 @@ static int cat_read(policydb_t * p
>         return -1;
>  }
>
> -static int (*read_f[SYM_NUM]) (policydb_t * p, hashtab_t h,
> +static int (*const read_f[SYM_NUM]) (policydb_t * p, hashtab_t h,
>                                struct policy_file * fp) = {
>  common_read, class_read, role_read, type_read, user_read,
>             cond_read_bool, sens_read, cat_read,};
> --
> 2.43.0
>
>
James Carter April 4, 2024, 4:23 p.m. UTC | #2 
On Wed, Apr 3, 2024 at 3:51 PM James Carter <jwcart2@gmail.com> wrote:
>
> On Tue, Apr 2, 2024 at 11:46 AM Christian Göttsche
> <cgoettsche@seltendoof.de> wrote:
> >
> > From: Christian Göttsche <cgzones@googlemail.com>
> >
> > The function pointer arrays are never changed, declare them const.
> >
> > Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
>
> Acked-by: James Carter <jwcart2@gmail.com>
>

Merged.
Thanks,
Jim

> > ---
> >  libsepol/src/policydb.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/libsepol/src/policydb.c b/libsepol/src/policydb.c
> > index 0c23a7a2..49f9e8af 100644
> > --- a/libsepol/src/policydb.c
> > +++ b/libsepol/src/policydb.c
> > @@ -1126,7 +1126,7 @@ static int cat_index(hashtab_key_t key, hashtab_datum_t datum, void *datap)
> >         return 0;
> >  }
> >
> > -static int (*index_f[SYM_NUM]) (hashtab_key_t key, hashtab_datum_t datum,
> > +static int (*const index_f[SYM_NUM]) (hashtab_key_t key, hashtab_datum_t datum,
> >                                 void *datap) = {
> >  common_index, class_index, role_index, type_index, user_index,
> >             cond_index_bool, sens_index, cat_index,};
> > @@ -1409,7 +1409,7 @@ static int cat_destroy(hashtab_key_t key, hashtab_datum_t datum, void *p
> >         return 0;
> >  }
> >
> > -static int (*destroy_f[SYM_NUM]) (hashtab_key_t key, hashtab_datum_t datum,
> > +static int (*const destroy_f[SYM_NUM]) (hashtab_key_t key, hashtab_datum_t datum,
> >                                   void *datap) = {
> >  common_destroy, class_destroy, role_destroy, type_destroy, user_destroy,
> >             cond_destroy_bool, sens_destroy, cat_destroy,};
> > @@ -3410,7 +3410,7 @@ static int cat_read(policydb_t * p
> >         return -1;
> >  }
> >
> > -static int (*read_f[SYM_NUM]) (policydb_t * p, hashtab_t h,
> > +static int (*const read_f[SYM_NUM]) (policydb_t * p, hashtab_t h,
> >                                struct policy_file * fp) = {
> >  common_read, class_read, role_read, type_read, user_read,
> >             cond_read_bool, sens_read, cat_read,};
> > --
> > 2.43.0
> >
> >
diff mbox series

Patch

diff --git a/libsepol/src/policydb.c b/libsepol/src/policydb.c
index 0c23a7a2..49f9e8af 100644
--- a/libsepol/src/policydb.c
+++ b/libsepol/src/policydb.c
@@ -1126,7 +1126,7 @@  static int cat_index(hashtab_key_t key, hashtab_datum_t datum, void *datap)
 	return 0;
 }
 
-static int (*index_f[SYM_NUM]) (hashtab_key_t key, hashtab_datum_t datum,
+static int (*const index_f[SYM_NUM]) (hashtab_key_t key, hashtab_datum_t datum,
 				void *datap) = {
 common_index, class_index, role_index, type_index, user_index,
 	    cond_index_bool, sens_index, cat_index,};
@@ -1409,7 +1409,7 @@  static int cat_destroy(hashtab_key_t key, hashtab_datum_t datum, void *p
 	return 0;
 }
 
-static int (*destroy_f[SYM_NUM]) (hashtab_key_t key, hashtab_datum_t datum,
+static int (*const destroy_f[SYM_NUM]) (hashtab_key_t key, hashtab_datum_t datum,
 				  void *datap) = {
 common_destroy, class_destroy, role_destroy, type_destroy, user_destroy,
 	    cond_destroy_bool, sens_destroy, cat_destroy,};
@@ -3410,7 +3410,7 @@  static int cat_read(policydb_t * p
 	return -1;
 }
 
-static int (*read_f[SYM_NUM]) (policydb_t * p, hashtab_t h,
+static int (*const read_f[SYM_NUM]) (policydb_t * p, hashtab_t h,
 			       struct policy_file * fp) = {
 common_read, class_read, role_read, type_read, user_read,
 	    cond_read_bool, sens_read, cat_read,};