Re: [RFC PATCH v2 19/27] libselinux: avoid unused function

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Oct 10, 2023 at 3:15 PM James Carter <jwcart2@xxxxxxxxx> wrote:
>
> On Mon, Aug 14, 2023 at 9:41 AM Christian Göttsche
> <cgzones@xxxxxxxxxxxxxx> wrote:
> >
> > Define selabel_subs_init() only if its call-sites are enabled.
> >
> > Signed-off-by: Christian Göttsche <cgzones@xxxxxxxxxxxxxx>
>
> Acked-by: James Carter <jwcart2@xxxxxxxxx>
>
Merged.
Thanks,
Jim

> > ---
> >  libselinux/src/label_file.c | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/libselinux/src/label_file.c b/libselinux/src/label_file.c
> > index f9f4648a..471fd56b 100644
> > --- a/libselinux/src/label_file.c
> > +++ b/libselinux/src/label_file.c
> > @@ -674,6 +674,7 @@ static char *selabel_sub(struct selabel_sub *ptr, const char *src)
> >         return NULL;
> >  }
> >
> > +#if !defined(BUILD_HOST) && !defined(ANDROID)
> >  static int selabel_subs_init(const char *path, struct selabel_digest *digest,
> >                        struct selabel_sub **out_subs)
> >  {
> > @@ -756,6 +757,7 @@ err:
> >         }
> >         goto out;
> >  }
> > +#endif
> >
> >  static char *selabel_sub_key(struct saved_data *data, const char *key)
> >  {
> > --
> > 2.40.1
> >




[Index of Archives]     [Selinux Refpolicy]     [Linux SGX]     [Fedora Users]     [Fedora Desktop]     [Yosemite Photos]     [Yosemite Camping]     [Yosemite Campsites]     [KDE Users]     [Gnome Users]

  Powered by Linux