| Message ID | alpine.LFD.2.21.1906131859430.5703@34-41-5D-CA-59-C7 (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] libsepol: more accurate error messages | expand |
ack on the series I see these are the three staged here: 3/3 uneeded int: https://github.com/SELinuxProject/selinux/pull/154 2/3 remove redundant if clause: https://github.com/SELinuxProject/selinux/pull/155 1/3 more accurate error message: https://github.com/SELinuxProject/selinux/pull/156 I will pull them in on Wednesday June 19 if no one objects. On Thu, Jun 13, 2019 at 9:01 AM Jokke Hämäläinen <jokke.hamalainen@kolttonen.fi> wrote: > > > Replace int ret with a constant 1 because it is > only used when returning from function and is > never modified. > > Signed-off-by: Unto Sten <sten.unto@gmail.com> > --- > libsepol/src/context.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/libsepol/src/context.c b/libsepol/src/context.c > index a88937fc..e81b28c6 100644 > --- a/libsepol/src/context.c > +++ b/libsepol/src/context.c > @@ -38,7 +38,6 @@ int context_is_valid(const policydb_t * p, const context_struct_t * c) > role_datum_t *role; > user_datum_t *usrdatum; > ebitmap_t types, roles; > - int ret = 1; > > ebitmap_init(&types); > ebitmap_init(&roles); > @@ -75,7 +74,7 @@ int context_is_valid(const policydb_t * p, const context_struct_t * c) > if (!mls_context_isvalid(p, c)) > return 0; > > - return ret; > + return 1; > } > > /* > -- > 2.21.0 >
merged On Sun, Jun 16, 2019 at 9:35 PM William Roberts <bill.c.roberts@gmail.com> wrote: > > ack on the series > > I see these are the three staged here: > 3/3 uneeded int: https://github.com/SELinuxProject/selinux/pull/154 > 2/3 remove redundant if clause: > https://github.com/SELinuxProject/selinux/pull/155 > 1/3 more accurate error message: > https://github.com/SELinuxProject/selinux/pull/156 > > I will pull them in on Wednesday June 19 if no one objects. > > On Thu, Jun 13, 2019 at 9:01 AM Jokke Hämäläinen > <jokke.hamalainen@kolttonen.fi> wrote: > > > > > > Replace int ret with a constant 1 because it is > > only used when returning from function and is > > never modified. > > > > Signed-off-by: Unto Sten <sten.unto@gmail.com> > > --- > > libsepol/src/context.c | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/libsepol/src/context.c b/libsepol/src/context.c > > index a88937fc..e81b28c6 100644 > > --- a/libsepol/src/context.c > > +++ b/libsepol/src/context.c > > @@ -38,7 +38,6 @@ int context_is_valid(const policydb_t * p, const context_struct_t * c) > > role_datum_t *role; > > user_datum_t *usrdatum; > > ebitmap_t types, roles; > > - int ret = 1; > > > > ebitmap_init(&types); > > ebitmap_init(&roles); > > @@ -75,7 +74,7 @@ int context_is_valid(const policydb_t * p, const context_struct_t * c) > > if (!mls_context_isvalid(p, c)) > > return 0; > > > > - return ret; > > + return 1; > > } > > > > /* > > -- > > 2.21.0 > >
diff --git a/libsepol/src/context.c b/libsepol/src/context.c index a88937fc..e81b28c6 100644 --- a/libsepol/src/context.c +++ b/libsepol/src/context.c @@ -38,7 +38,6 @@ int context_is_valid(const policydb_t * p, const context_struct_t * c) role_datum_t *role; user_datum_t *usrdatum; ebitmap_t types, roles; - int ret = 1; ebitmap_init(&types); ebitmap_init(&roles); @@ -75,7 +74,7 @@ int context_is_valid(const policydb_t * p, const context_struct_t * c) if (!mls_context_isvalid(p, c)) return 0; - return ret; + return 1; } /*
Replace int ret with a constant 1 because it is only used when returning from function and is never modified. Signed-off-by: Unto Sten <sten.unto@gmail.com> --- libsepol/src/context.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)