On Mon, Apr 16, 2018 at 5:34 AM, Stephen Smalley <sds@xxxxxxxxxxxxx> wrote: > On 04/13/2018 08:40 PM, William Roberts wrote: >> In general this series looks fine. >> >> However, checkpatch.pl is complaining about DOS line endings in your patches: >> >> For example: >> ERROR: DOS line endings >> #325: FILE: libselinux/src/label_file.h:281: >> +^I^Iint alloc_stems = data->alloc_stems * 2 + 16;^M$ > > If needed, dos2unix can be used to strip them. However, I think git am takes care of this for you. > FYI your patches are staged here: https://github.com/SELinuxProject/selinux/pull/93 If no one nacks them, ill merge latter this week. Thanks. >> >> >> >> >> >> On Fri, Apr 13, 2018 at 1:34 PM, Nicolas Iooss <nicolas.iooss@xxxxxxx> wrote: >>> In getconlist.c, main() does not use usercon. Remove this variable. >>> >>> Signed-off-by: Nicolas Iooss <nicolas.iooss@xxxxxxx> >>> --- >>> libselinux/utils/getconlist.c | 3 +-- >>> 1 file changed, 1 insertion(+), 2 deletions(-) >>> >>> diff --git a/libselinux/utils/getconlist.c b/libselinux/utils/getconlist.c >>> index abfe2c742bfb..5ac0ca85075c 100644 >>> --- a/libselinux/utils/getconlist.c >>> +++ b/libselinux/utils/getconlist.c >>> @@ -19,7 +19,7 @@ static __attribute__ ((__noreturn__)) void usage(const char *name, const char *d >>> >>> int main(int argc, char **argv) >>> { >>> - char **list, *usercon = NULL, *cur_context = NULL; >>> + char **list, *cur_context = NULL; >>> char *user = NULL, *level = NULL; >>> int ret, i, opt; >>> >>> @@ -69,7 +69,6 @@ int main(int argc, char **argv) >>> freeconary(list); >>> } >>> >>> - free(usercon); >>> free(level); >>> >>> return 0; >>> -- >>> 2.17.0 >>> >>> >> >
