* [PATCH] policycoreutils/setfiles: Drop unused nerr variable
@ 2021-02-01 14:32 Petr Lautrbach
2021-02-01 21:55 ` Nicolas Iooss
0 siblings, 1 reply; 3+ messages in thread
From: Petr Lautrbach @ 2021-02-01 14:32 UTC (permalink / raw)
To: selinux; +Cc: Petr Lautrbach, Nicolas Iooss
Suggested-by: Nicolas Iooss <nicolas.iooss@m4x.org>
Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
---
policycoreutils/setfiles/setfiles.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/policycoreutils/setfiles/setfiles.c b/policycoreutils/setfiles/setfiles.c
index 92616571ef2a..f018d161aa9e 100644
--- a/policycoreutils/setfiles/setfiles.c
+++ b/policycoreutils/setfiles/setfiles.c
@@ -19,7 +19,6 @@ static int warn_no_match;
static int null_terminated;
static int request_digest;
static struct restore_opts r_opts;
-static int nerr;
#define STAT_BLOCK_SIZE 1
@@ -161,7 +160,6 @@ int main(int argc, char **argv)
warn_no_match = 0;
request_digest = 0;
policyfile = NULL;
- nerr = 0;
r_opts.abort_on_error = 0;
r_opts.progname = strdup(argv[0]);
@@ -427,9 +425,6 @@ int main(int argc, char **argv)
r_opts.selabel_opt_digest = (request_digest ? (char *)1 : NULL);
r_opts.selabel_opt_path = altpath;
- if (nerr)
- exit(-1);
-
restore_init(&r_opts);
if (use_input_file) {
--
2.30.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] policycoreutils/setfiles: Drop unused nerr variable
2021-02-01 14:32 [PATCH] policycoreutils/setfiles: Drop unused nerr variable Petr Lautrbach
@ 2021-02-01 21:55 ` Nicolas Iooss
2021-02-03 8:34 ` Petr Lautrbach
0 siblings, 1 reply; 3+ messages in thread
From: Nicolas Iooss @ 2021-02-01 21:55 UTC (permalink / raw)
To: Petr Lautrbach; +Cc: SElinux list
On Mon, Feb 1, 2021 at 3:32 PM Petr Lautrbach <plautrba@redhat.com> wrote:
>
> Suggested-by: Nicolas Iooss <nicolas.iooss@m4x.org>
> Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
Acked-by: Nicolas Iooss <nicolas.iooss@m4x.org>
Thanks!
Nicolas
> ---
> policycoreutils/setfiles/setfiles.c | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/policycoreutils/setfiles/setfiles.c b/policycoreutils/setfiles/setfiles.c
> index 92616571ef2a..f018d161aa9e 100644
> --- a/policycoreutils/setfiles/setfiles.c
> +++ b/policycoreutils/setfiles/setfiles.c
> @@ -19,7 +19,6 @@ static int warn_no_match;
> static int null_terminated;
> static int request_digest;
> static struct restore_opts r_opts;
> -static int nerr;
>
> #define STAT_BLOCK_SIZE 1
>
> @@ -161,7 +160,6 @@ int main(int argc, char **argv)
> warn_no_match = 0;
> request_digest = 0;
> policyfile = NULL;
> - nerr = 0;
>
> r_opts.abort_on_error = 0;
> r_opts.progname = strdup(argv[0]);
> @@ -427,9 +425,6 @@ int main(int argc, char **argv)
> r_opts.selabel_opt_digest = (request_digest ? (char *)1 : NULL);
> r_opts.selabel_opt_path = altpath;
>
> - if (nerr)
> - exit(-1);
> -
> restore_init(&r_opts);
>
> if (use_input_file) {
> --
> 2.30.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] policycoreutils/setfiles: Drop unused nerr variable
2021-02-01 21:55 ` Nicolas Iooss
@ 2021-02-03 8:34 ` Petr Lautrbach
0 siblings, 0 replies; 3+ messages in thread
From: Petr Lautrbach @ 2021-02-03 8:34 UTC (permalink / raw)
To: SElinux list; +Cc: Nicolas Iooss
Nicolas Iooss <nicolas.iooss@m4x.org> writes:
> On Mon, Feb 1, 2021 at 3:32 PM Petr Lautrbach <plautrba@redhat.com> wrote:
>>
>> Suggested-by: Nicolas Iooss <nicolas.iooss@m4x.org>
>> Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
>
> Acked-by: Nicolas Iooss <nicolas.iooss@m4x.org>
Merged.
> Thanks!
> Nicolas
>> ---
>> policycoreutils/setfiles/setfiles.c | 5 -----
>> 1 file changed, 5 deletions(-)
>>
>> diff --git a/policycoreutils/setfiles/setfiles.c b/policycoreutils/setfiles/setfiles.c
>> index 92616571ef2a..f018d161aa9e 100644
>> --- a/policycoreutils/setfiles/setfiles.c
>> +++ b/policycoreutils/setfiles/setfiles.c
>> @@ -19,7 +19,6 @@ static int warn_no_match;
>> static int null_terminated;
>> static int request_digest;
>> static struct restore_opts r_opts;
>> -static int nerr;
>>
>> #define STAT_BLOCK_SIZE 1
>>
>> @@ -161,7 +160,6 @@ int main(int argc, char **argv)
>> warn_no_match = 0;
>> request_digest = 0;
>> policyfile = NULL;
>> - nerr = 0;
>>
>> r_opts.abort_on_error = 0;
>> r_opts.progname = strdup(argv[0]);
>> @@ -427,9 +425,6 @@ int main(int argc, char **argv)
>> r_opts.selabel_opt_digest = (request_digest ? (char *)1 : NULL);
>> r_opts.selabel_opt_path = altpath;
>>
>> - if (nerr)
>> - exit(-1);
>> -
>> restore_init(&r_opts);
>>
>> if (use_input_file) {
>> --
>> 2.30.0
>>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-03 8:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-01 14:32 [PATCH] policycoreutils/setfiles: Drop unused nerr variable Petr Lautrbach
2021-02-01 21:55 ` Nicolas Iooss
2021-02-03 8:34 ` Petr Lautrbach
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.