Not applied to queue branch of the upstream tree as all of these
appear to already be fixed.
-Eric
On Tue, Aug 30, 2011 at 1:31 AM, Harry Ciao <qingtao.cao@xxxxxxxxxxxxx> wrote:
> Fix below compile errors if DEBUG is turned on:
>
> matchpathcon.c:110: error: declaration of ‘rc’ shadows a previous local
> matchpathcon.c:48: error: shadowed declaration is here
> matchpathcon.c:48: error: unused variable ‘rc’
>
> seunshare.c:346: error: too many arguments for format
> seunshare.c:275: error: unused variable ‘flag_index’
>
> Signed-off-by: Harry Ciao <qingtao.cao@xxxxxxxxxxxxx>
> ---
> libselinux/utils/matchpathcon.c | 2 +-
> policycoreutils/sandbox/seunshare.c | 4 +---
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/libselinux/utils/matchpathcon.c b/libselinux/utils/matchpathcon.c
> index 2fa21bc..892e33d 100644
> --- a/libselinux/utils/matchpathcon.c
> +++ b/libselinux/utils/matchpathcon.c
> @@ -107,7 +107,7 @@ int main(int argc, char **argv)
> }
> }
> for (i = optind; i < argc; i++) {
> - int rc, mode = 0;
> + int mode = 0;
> struct stat buf;
> char *path = argv[i];
> int len = strlen(path);
> diff --git a/policycoreutils/sandbox/seunshare.c b/policycoreutils/sandbox/seunshare.c
> index f9bf12c..a640c56 100644
> --- a/policycoreutils/sandbox/seunshare.c
> +++ b/policycoreutils/sandbox/seunshare.c
> @@ -272,7 +272,6 @@ int main(int argc, char **argv) {
>
> security_context_t scontext = NULL;
>
> - int flag_index; /* flag index in argv[] */
> int clflag; /* holds codes for command line flags */
> char *tmpdir_s = NULL; /* tmpdir spec'd by user in argv[] */
> char *homedir_s = NULL; /* homedir spec'd by user in argv[] */
> @@ -342,8 +341,7 @@ int main(int argc, char **argv) {
> }
>
> if (! homedir_s && ! tmpdir_s) {
> - fprintf(stderr, _("Error: tmpdir and/or homedir required \n"),
> - "%s\n", USAGE_STRING);
> + fprintf(stderr, _("Error: tmpdir and/or homedir required \n %s\n"), USAGE_STRING);
> return -1;
> }
>
> --
> 1.7.0.4
>
>
> --
> This message was distributed to subscribers of the selinux mailing list.
> If you no longer wish to subscribe, send mail to majordomo@xxxxxxxxxxxxx with
> the words "unsubscribe selinux" without quotes as the message.
>
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@xxxxxxxxxxxxx with
the words "unsubscribe selinux" without quotes as the message.
