diff mbox series

[RFC,v2,14/27] libselinux: parameter simplifications

Message ID 20230814132025.45364-15-cgzones@googlemail.com (mailing list archive)
State Accepted
Commit 0eb989f69925
Delegated to: Petr Lautrbach
Headers show
Series libselinux: rework selabel_file(5) database | expand

Commit Message

Christian Göttsche Aug. 14, 2023, 1:20 p.m. UTC 
Use bool where applicable.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
 libselinux/src/label.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Comments

James Carter Oct. 5, 2023, 3:39 p.m. UTC | #1 
On Mon, Aug 14, 2023 at 9:41 AM Christian Göttsche
<cgzones@googlemail.com> wrote:
>
> Use bool where applicable.
>
> Signed-off-by: Christian Göttsche <cgzones@googlemail.com>

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

> ---
>  libselinux/src/label.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/libselinux/src/label.c b/libselinux/src/label.c
> index c0f586a2..9a972f79 100644
> --- a/libselinux/src/label.c
> +++ b/libselinux/src/label.c
> @@ -137,9 +137,9 @@ out:
>  }
>
>  /* Public API helpers */
> -static int selabel_fini(struct selabel_handle *rec,
> +static int selabel_fini(const struct selabel_handle *rec,
>                             struct selabel_lookup_rec *lr,
> -                           int translating)
> +                           bool translating)
>  {
>         if (compat_validate(rec, lr, rec->spec_file, lr->lineno))
>                 return -1;
> @@ -152,7 +152,7 @@ static int selabel_fini(struct selabel_handle *rec,
>  }
>
>  static struct selabel_lookup_rec *
> -selabel_lookup_common(struct selabel_handle *rec, int translating,
> +selabel_lookup_common(struct selabel_handle *rec, bool translating,
>                       const char *key, int type)
>  {
>         struct selabel_lookup_rec *lr;
> @@ -173,7 +173,7 @@ selabel_lookup_common(struct selabel_handle *rec, int translating,
>  }
>
>  static struct selabel_lookup_rec *
> -selabel_lookup_bm_common(struct selabel_handle *rec, int translating,
> +selabel_lookup_bm_common(struct selabel_handle *rec, bool translating,
>                       const char *key, int type, const char **aliases)
>  {
>         struct selabel_lookup_rec *lr;
> @@ -239,7 +239,7 @@ int selabel_lookup(struct selabel_handle *rec, char **con,
>  {
>         struct selabel_lookup_rec *lr;
>
> -       lr = selabel_lookup_common(rec, 1, key, type);
> +       lr = selabel_lookup_common(rec, true, key, type);
>         if (!lr)
>                 return -1;
>
> @@ -252,7 +252,7 @@ int selabel_lookup_raw(struct selabel_handle *rec, char **con,
>  {
>         struct selabel_lookup_rec *lr;
>
> -       lr = selabel_lookup_common(rec, 0, key, type);
> +       lr = selabel_lookup_common(rec, false, key, type);
>         if (!lr)
>                 return -1;
>
> @@ -307,7 +307,7 @@ int selabel_lookup_best_match(struct selabel_handle *rec, char **con,
>                 return -1;
>         }
>
> -       lr = selabel_lookup_bm_common(rec, 1, key, type, aliases);
> +       lr = selabel_lookup_bm_common(rec, true, key, type, aliases);
>         if (!lr)
>                 return -1;
>
> @@ -325,7 +325,7 @@ int selabel_lookup_best_match_raw(struct selabel_handle *rec, char **con,
>                 return -1;
>         }
>
> -       lr = selabel_lookup_bm_common(rec, 0, key, type, aliases);
> +       lr = selabel_lookup_bm_common(rec, false, key, type, aliases);
>         if (!lr)
>                 return -1;
>
> --
> 2.40.1
>
James Carter Oct. 12, 2023, 5:54 p.m. UTC | #2 
On Thu, Oct 5, 2023 at 11:39 AM James Carter <jwcart2@gmail.com> wrote:
>
> On Mon, Aug 14, 2023 at 9:41 AM Christian Göttsche
> <cgzones@googlemail.com> wrote:
> >
> > Use bool where applicable.
> >
> > Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
>
> Acked-by: James Carter <jwcart2@gmail.com>
>

Merged.
Thanks,
Jim

> > ---
> >  libselinux/src/label.c | 16 ++++++++--------
> >  1 file changed, 8 insertions(+), 8 deletions(-)
> >
> > diff --git a/libselinux/src/label.c b/libselinux/src/label.c
> > index c0f586a2..9a972f79 100644
> > --- a/libselinux/src/label.c
> > +++ b/libselinux/src/label.c
> > @@ -137,9 +137,9 @@ out:
> >  }
> >
> >  /* Public API helpers */
> > -static int selabel_fini(struct selabel_handle *rec,
> > +static int selabel_fini(const struct selabel_handle *rec,
> >                             struct selabel_lookup_rec *lr,
> > -                           int translating)
> > +                           bool translating)
> >  {
> >         if (compat_validate(rec, lr, rec->spec_file, lr->lineno))
> >                 return -1;
> > @@ -152,7 +152,7 @@ static int selabel_fini(struct selabel_handle *rec,
> >  }
> >
> >  static struct selabel_lookup_rec *
> > -selabel_lookup_common(struct selabel_handle *rec, int translating,
> > +selabel_lookup_common(struct selabel_handle *rec, bool translating,
> >                       const char *key, int type)
> >  {
> >         struct selabel_lookup_rec *lr;
> > @@ -173,7 +173,7 @@ selabel_lookup_common(struct selabel_handle *rec, int translating,
> >  }
> >
> >  static struct selabel_lookup_rec *
> > -selabel_lookup_bm_common(struct selabel_handle *rec, int translating,
> > +selabel_lookup_bm_common(struct selabel_handle *rec, bool translating,
> >                       const char *key, int type, const char **aliases)
> >  {
> >         struct selabel_lookup_rec *lr;
> > @@ -239,7 +239,7 @@ int selabel_lookup(struct selabel_handle *rec, char **con,
> >  {
> >         struct selabel_lookup_rec *lr;
> >
> > -       lr = selabel_lookup_common(rec, 1, key, type);
> > +       lr = selabel_lookup_common(rec, true, key, type);
> >         if (!lr)
> >                 return -1;
> >
> > @@ -252,7 +252,7 @@ int selabel_lookup_raw(struct selabel_handle *rec, char **con,
> >  {
> >         struct selabel_lookup_rec *lr;
> >
> > -       lr = selabel_lookup_common(rec, 0, key, type);
> > +       lr = selabel_lookup_common(rec, false, key, type);
> >         if (!lr)
> >                 return -1;
> >
> > @@ -307,7 +307,7 @@ int selabel_lookup_best_match(struct selabel_handle *rec, char **con,
> >                 return -1;
> >         }
> >
> > -       lr = selabel_lookup_bm_common(rec, 1, key, type, aliases);
> > +       lr = selabel_lookup_bm_common(rec, true, key, type, aliases);
> >         if (!lr)
> >                 return -1;
> >
> > @@ -325,7 +325,7 @@ int selabel_lookup_best_match_raw(struct selabel_handle *rec, char **con,
> >                 return -1;
> >         }
> >
> > -       lr = selabel_lookup_bm_common(rec, 0, key, type, aliases);
> > +       lr = selabel_lookup_bm_common(rec, false, key, type, aliases);
> >         if (!lr)
> >                 return -1;
> >
> > --
> > 2.40.1
> >
diff mbox series

Patch

diff --git a/libselinux/src/label.c b/libselinux/src/label.c
index c0f586a2..9a972f79 100644
--- a/libselinux/src/label.c
+++ b/libselinux/src/label.c
@@ -137,9 +137,9 @@  out:
 }
 
 /* Public API helpers */
-static int selabel_fini(struct selabel_handle *rec,
+static int selabel_fini(const struct selabel_handle *rec,
 			    struct selabel_lookup_rec *lr,
-			    int translating)
+			    bool translating)
 {
 	if (compat_validate(rec, lr, rec->spec_file, lr->lineno))
 		return -1;
@@ -152,7 +152,7 @@  static int selabel_fini(struct selabel_handle *rec,
 }
 
 static struct selabel_lookup_rec *
-selabel_lookup_common(struct selabel_handle *rec, int translating,
+selabel_lookup_common(struct selabel_handle *rec, bool translating,
 		      const char *key, int type)
 {
 	struct selabel_lookup_rec *lr;
@@ -173,7 +173,7 @@  selabel_lookup_common(struct selabel_handle *rec, int translating,
 }
 
 static struct selabel_lookup_rec *
-selabel_lookup_bm_common(struct selabel_handle *rec, int translating,
+selabel_lookup_bm_common(struct selabel_handle *rec, bool translating,
 		      const char *key, int type, const char **aliases)
 {
 	struct selabel_lookup_rec *lr;
@@ -239,7 +239,7 @@  int selabel_lookup(struct selabel_handle *rec, char **con,
 {
 	struct selabel_lookup_rec *lr;
 
-	lr = selabel_lookup_common(rec, 1, key, type);
+	lr = selabel_lookup_common(rec, true, key, type);
 	if (!lr)
 		return -1;
 
@@ -252,7 +252,7 @@  int selabel_lookup_raw(struct selabel_handle *rec, char **con,
 {
 	struct selabel_lookup_rec *lr;
 
-	lr = selabel_lookup_common(rec, 0, key, type);
+	lr = selabel_lookup_common(rec, false, key, type);
 	if (!lr)
 		return -1;
 
@@ -307,7 +307,7 @@  int selabel_lookup_best_match(struct selabel_handle *rec, char **con,
 		return -1;
 	}
 
-	lr = selabel_lookup_bm_common(rec, 1, key, type, aliases);
+	lr = selabel_lookup_bm_common(rec, true, key, type, aliases);
 	if (!lr)
 		return -1;
 
@@ -325,7 +325,7 @@  int selabel_lookup_best_match_raw(struct selabel_handle *rec, char **con,
 		return -1;
 	}
 
-	lr = selabel_lookup_bm_common(rec, 0, key, type, aliases);
+	lr = selabel_lookup_bm_common(rec, false, key, type, aliases);
 	if (!lr)
 		return -1;