- fix a couple of compiler warnings.

This commit is contained in:
Ian Kent 2013-07-13 11:35:38 +08:00
parent a41d5f9d71
commit 79f481ae63
2 changed files with 57 additions and 1 deletions

View File

@ -0,0 +1,51 @@
autofs-5.0.7 - fix a couple of compiler warnings
From: Ian Kent <ikent@redhat.com>
Quiet a couple of ompiler warnings by making intention explicit using brackets.
---
CHANGELOG | 1 +
modules/mount_bind.c | 2 +-
modules/mount_nfs.c | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 37eac72..7749f01 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -54,6 +54,7 @@
- misc man page fixes.
- fix add null check in parse_server_string().
- don't override LDFLAGS in make rules.
+- fix a couple of compiler warnings.
25/07/2012 autofs-5.0.7
=======================
diff --git a/modules/mount_bind.c b/modules/mount_bind.c
index 61a773c..2b70104 100644
--- a/modules/mount_bind.c
+++ b/modules/mount_bind.c
@@ -208,7 +208,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
MODPREFIX
"failed to create local mount %s -> %s",
fullpath, what);
- if (ap->flags & MOUNT_FLAG_GHOST && !status)
+ if ((ap->flags & MOUNT_FLAG_GHOST) && !status)
if (mkdir_path(fullpath, 0555) && errno != EEXIST) {
char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
error(ap->logopt,
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
index 3d2ccea..adf2002 100644
--- a/modules/mount_nfs.c
+++ b/modules/mount_nfs.c
@@ -202,8 +202,8 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
*/
if ((hosts && !hosts->next) &&
mount_default_proto == 4 &&
- vers & NFS_VERS_MASK != 0 &&
- vers & NFS4_VERS_MASK != 0) {
+ (vers & NFS_VERS_MASK) != 0 &&
+ (vers & NFS4_VERS_MASK) != 0) {
unsigned int v4_probe_ok = 0;
struct host *tmp = new_host(hosts->name,
hosts->addr, hosts->addr_len,

View File

@ -8,7 +8,7 @@
Summary: A tool for automatically mounting and unmounting filesystems Summary: A tool for automatically mounting and unmounting filesystems
Name: autofs Name: autofs
Version: 5.0.7 Version: 5.0.7
Release: 26%{?dist} Release: 27%{?dist}
Epoch: 1 Epoch: 1
License: GPLv2+ License: GPLv2+
Group: System Environment/Daemons Group: System Environment/Daemons
@ -97,6 +97,7 @@ Patch81: autofs-5.0.7-fix-add-null-check-in-parse_server_string.patch
Patch82: autofs-5.0.7-check-for-protocol-option.patch Patch82: autofs-5.0.7-check-for-protocol-option.patch
Patch83: autofs-5.0.7-use-ulimit-max-open-files-if-greater-than-internal-maximum.patch Patch83: autofs-5.0.7-use-ulimit-max-open-files-if-greater-than-internal-maximum.patch
Patch84: autofs-5.0.7-dont-override-LDFLAGS-in-make-rules.patch Patch84: autofs-5.0.7-dont-override-LDFLAGS-in-make-rules.patch
Patch85: autofs-5.0.7-fix-a-couple-of-compiler-warnings.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{with_systemd} %if %{with_systemd}
BuildRequires: systemd-units BuildRequires: systemd-units
@ -238,6 +239,7 @@ echo %{version}-%{release} > .version
%patch82 -p1 %patch82 -p1
%patch83 -p1 %patch83 -p1
%patch84 -p1 %patch84 -p1
%patch85 -p1
%build %build
LDFLAGS=-Wl,-z,now LDFLAGS=-Wl,-z,now
@ -329,6 +331,9 @@ fi
%dir /etc/auto.master.d %dir /etc/auto.master.d
%changelog %changelog
* Sat Jul 13 2013 Ian Kent <ikent@redhat.com> - 1:5.0.7-27
- fix a couple of compiler warnings.
* Fri Jul 12 2013 Ian Kent <ikent@redhat.com> - 1:5.0.7-26 * Fri Jul 12 2013 Ian Kent <ikent@redhat.com> - 1:5.0.7-26
- link with full reloc options. - link with full reloc options.