From 8a6869f7901b9e8fc26b6a2bbadcdfa1f8fbcc3b Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Fri, 9 Dec 2022 12:40:52 -0600 Subject: [PATCH] Fix various warnings on RHEL5 Building on RHEL5 with gcc 4.1 yields a few warnings that break the build with --enable-checking. A couple of headers lack a newline at the end of the file, such as audit.h: CC .../src/audit/audit.lo In file included from .../src/audit/audit.c:30: .../src/audit/audit.h:337:31: error: no newline at end of file And UKERNEL's afsincludes.h: CC .../src/libuafs/afs_analyze.lo In file included from .../src/afs/afsincludes.h:16, from .../git-foo/src/afs/afs_analyze.c:34: .../src/afs/UKERNEL/afsincludes.h:35:47: error: no newline at end of file To fix these, just add a trailing newline. osi_vfsops.c has an 'out:' label that is only used under certain #ifdefs, but we always define it, leading to a warning when it's defined but not used: CC [M] .../src/libafs/MODLOAD-2.6.18-419.el5-MP/osi_vfsops.o cc1: warnings being treated as errors .../src/libafs/MODLOAD-2.6.18-419.el5-MP/osi_vfsops.c: In function 'afs_fill_super': .../src/libafs/MODLOAD-2.6.18-419.el5-MP/osi_vfsops.c:167: warning: label 'out' defined but not used To fix this, put the 'out:' definition under the same conditions as its users. rxgk_crypto_rfc3961.c uses 'iterations' in a way where gcc claims it may be uninitialized: CC .../src/rxgk/rxgk_crypto_rfc3961.lo cc1: warnings being treated as errors .../src/rxgk/rxgk_crypto_rfc3961.c: In function 'rxgk_derive_tk': .../src/rxgk/rxgk_crypto_rfc3961.c:617: warning: 'iterations' may be used uninitialized in this function This doesn't seem possible to actually use uninitialized, but initialize it to get rid of the warning. Change-Id: I68dc4378d03f956c0e81b1dba37ed09d2e396c56 Reviewed-on: https://gerrit.openafs.org/15217 Tested-by: BuildBot Reviewed-by: Cheyenne Wills Reviewed-by: Mark Vitale Reviewed-by: Michael Meffie --- src/afs/LINUX/osi_vfsops.c | 5 ++++- src/afs/UKERNEL/afsincludes.h | 2 +- src/audit/audit.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/afs/LINUX/osi_vfsops.c b/src/afs/LINUX/osi_vfsops.c index e253c2e61d..e4d1d8b6ca 100644 --- a/src/afs/LINUX/osi_vfsops.c +++ b/src/afs/LINUX/osi_vfsops.c @@ -164,7 +164,10 @@ afs_fill_super(struct super_block *sb, void *data, int silent) #endif #endif code = afs_root(sb); -out: + +#if defined(HAVE_LINUX_SUPER_SETUP_BDI) || defined(HAVE_LINUX_BDI_INIT) + out: +#endif if (code) { afs_globalVFS = NULL; afs_FlushAllVCaches(); diff --git a/src/afs/UKERNEL/afsincludes.h b/src/afs/UKERNEL/afsincludes.h index 01e6bce7ca..332948a7ca 100644 --- a/src/afs/UKERNEL/afsincludes.h +++ b/src/afs/UKERNEL/afsincludes.h @@ -32,4 +32,4 @@ #include "afs/discon.h" #include "roken.h" -#endif /* OPENAFS_AFS_UKERNEL_AFSINCLUDES_H */ \ No newline at end of file +#endif /* OPENAFS_AFS_UKERNEL_AFSINCLUDES_H */ diff --git a/src/audit/audit.h b/src/audit/audit.h index 372a061528..21f66fba03 100644 --- a/src/audit/audit.h +++ b/src/audit/audit.h @@ -334,4 +334,4 @@ void audit_PrintStats(FILE *out); void osi_audit_open(void); void osi_audit_close(void); -#endif /* AFS_AUDIT_AUDIT_H */ \ No newline at end of file +#endif /* AFS_AUDIT_AUDIT_H */