@@ -638,13 +638,12 @@ my_am_cflags="\
-Werror=parentheses \
-Werror=aggregate-return \
-Werror=unused-result \
- -Wno-cast-function-type \
-fno-strict-aliasing \
"
AC_DEFUN([CHECK_CCSUPPORT], [
my_save_cflags="$CFLAGS"
- CFLAGS=$1
+ CFLAGS="-Werror $1"
AC_MSG_CHECKING([whether CC supports $1])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
[AC_MSG_RESULT([yes])]
@@ -658,9 +657,10 @@ CHECK_CCSUPPORT([-Werror=format-overflow=2], [flg1])
CHECK_CCSUPPORT([-Werror=int-conversion], [flg2])
CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3])
CHECK_CCSUPPORT([-Werror=misleading-indentation], [flg4])
+CHECK_CCSUPPORT([-Wno-cast-function-type], [flg5])
AX_GCC_FUNC_ATTRIBUTE([format])
-AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4"])
+AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4 $flg5"])
# Make sure that $ACLOCAL_FLAGS are used during a rebuild
AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"])
@@ -7,7 +7,7 @@
*/
#ifndef _XMALLOC_H
-#define _MALLOC_H
+#define _XMALLOC_H
#include "compiler.h"
@@ -1268,14 +1268,14 @@ nfs_nfs_program(struct mount_options *options, unsigned long *program)
int
nfs_nfs_version(char *type, struct mount_options *options, struct nfs_version *version)
{
- char *version_key, *version_val, *cptr;
+ char *version_key, *version_val = NULL, *cptr;
int i, found = 0;
version->v_mode = V_DEFAULT;
for (i = 0; nfs_version_opttbl[i]; i++) {
if (po_contains_prefix(options, nfs_version_opttbl[i],
- &version_key) == PO_FOUND) {
+ &version_key) == PO_FOUND) {
found++;
break;
}
@@ -1094,9 +1094,7 @@ static int nfsmount_fg(struct nfsmount_info *mi)
if (nfs_try_mount(mi))
return EX_SUCCESS;
-#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
if (errno == EBUSY && is_mountpoint(mi->node)) {
-#pragma GCC diagnostic warning "-Wdiscarded-qualifiers"
/*
* EBUSY can happen when mounting a filesystem that
* is already mounted or when the context= are
@@ -57,7 +57,7 @@ enum nfsd_fsid {
};
#undef is_mountpoint
-static int is_mountpoint(char *path)
+static int is_mountpoint(const char *path)
{
return check_is_mountpoint(path, nfsd_path_lstat);
}
Signed-off-by: Doug Nazar <nazard@nazar.ca> --- configure.ac | 6 +++--- support/include/xcommon.h | 2 +- utils/mount/network.c | 4 ++-- utils/mount/stropts.c | 2 -- utils/mountd/cache.c | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-)