From de43a0f8829e26b2c56347176d7938810a38469c Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Thu, 12 Apr 2018 23:18:55 -0400 Subject: [PATCH] Suppress statement not reached warnings after noreturn functions Use the AFS_UNREACHED macro to suppress statement not reached warnings while building under Solaris Studio. These warnings are emitted for statements following functions declared with the noreturn function attribute. Change-Id: Ic18cbb3ea78124acbe69edc0eccb2473b46648fe Reviewed-on: https://gerrit.openafs.org/13010 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk --- src/afs/SOLARIS/osi_vnodeops.c | 2 +- src/afs/afs_util.c | 2 +- src/budb/db_hash.c | 7 +++---- src/dir/salvage.c | 4 ++-- src/ptserver/ptubik.c | 4 ++-- src/tools/rxperf/rxperf.c | 5 +++-- src/ubik/ubik.c | 4 ++-- src/vol/salvaged.c | 2 +- src/vol/salvager.c | 2 +- src/vol/salvsync-server.c | 4 ++-- src/volser/volmain.c | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/afs/SOLARIS/osi_vnodeops.c b/src/afs/SOLARIS/osi_vnodeops.c index e85beb9..742700c 100644 --- a/src/afs/SOLARIS/osi_vnodeops.c +++ b/src/afs/SOLARIS/osi_vnodeops.c @@ -473,7 +473,7 @@ afs_never_putapage(struct vnode *vp, struct page *pages, u_offset_t * offp, struct vcache *avc = VTOAFS(vp); osi_Assert((avc->f.states & CRO) != 0); osi_Panic("Dirty pages while flushing a read-only volume vnode."); - return EIO; /* unreachable */ + AFS_UNREACHED(return EIO); } int diff --git a/src/afs/afs_util.c b/src/afs/afs_util.c index 491f522..d8fe112 100644 --- a/src/afs/afs_util.c +++ b/src/afs/afs_util.c @@ -242,7 +242,7 @@ afs_badop(void) { AFS_STATCNT(afs_badop); osi_Panic("afs bad vnode op"); - return 0; + AFS_UNREACHED(return 0); } /* diff --git a/src/budb/db_hash.c b/src/budb/db_hash.c index 7aa2847..d9d20e5 100644 --- a/src/budb/db_hash.c +++ b/src/budb/db_hash.c @@ -532,7 +532,7 @@ ht_minHBlocks(struct memoryHashTable *mht) default: db_panic("Illegal hash function type"); - retval = -1; /* not reached */ + AFS_UNREACHED(return -1); } return (retval); } @@ -567,7 +567,7 @@ ht_HashEntry(struct memoryHashTable *mht, default: db_panic("illegal hash function"); - retval = -1; /* not reached */ + AFS_UNREACHED(return -1); } return (retval); @@ -630,8 +630,7 @@ ht_KeyMatch(int type, char *key, char *e) default: db_panic("illegal hash function"); } - /* not reached */ - return 0; + AFS_UNREACHED(return 0); } /* ht_LookupEntry diff --git a/src/dir/salvage.c b/src/dir/salvage.c index a20a67d..a626317 100644 --- a/src/dir/salvage.c +++ b/src/dir/salvage.c @@ -95,7 +95,7 @@ DirOK(void *file) if (DErrno != 0) { printf("Could not read first page in directory (%d)\n", DErrno); Die("dirok1"); - return 1; + AFS_UNREACHED(return 1); } printf("First page in directory does not exist.\n"); return 0; @@ -178,7 +178,7 @@ DirOK(void *file) /* couldn't read page, but not because it wasn't there permanently */ printf("Failed to read dir page %d (errno %d)\n", i, DErrno); Die("dirok2"); - return 1; + AFS_UNREACHED(return 1); } printf("Directory shorter than alloMap indicates (page %d)\n", i); return 0; diff --git a/src/ptserver/ptubik.c b/src/ptserver/ptubik.c index 9d2d916..3c9e946 100644 --- a/src/ptserver/ptubik.c +++ b/src/ptserver/ptubik.c @@ -115,8 +115,8 @@ panic(char *format, ...) va_end(ap); abort(); - printf("BACK FROM ABORT\n"); /* shouldn't come back from floating pt exception */ - exit(1); /* never know, though */ + AFS_UNREACHED(printf("BACK FROM ABORT\n")); /* shouldn't come back from floating pt exception */ + AFS_UNREACHED(exit(1)); /* never know, though */ } int diff --git a/src/tools/rxperf/rxperf.c b/src/tools/rxperf/rxperf.c index 6a9dbc3..bcefe9a 100644 --- a/src/tools/rxperf/rxperf.c +++ b/src/tools/rxperf/rxperf.c @@ -671,9 +671,10 @@ client_thread( void *vparams) #ifdef AFS_PTHREAD_ENV pthread_exit(NULL); -#endif - + AFS_UNREACHED(return NULL); +#else return NULL; +#endif } /* diff --git a/src/ubik/ubik.c b/src/ubik/ubik.c index a8bd2e9..f28a69b 100644 --- a/src/ubik/ubik.c +++ b/src/ubik/ubik.c @@ -1392,8 +1392,8 @@ panic(char *format, ...) va_end(ap); abort(); - ViceLog(0, ("BACK FROM ABORT\n")); /* shouldn't come back */ - exit(1); /* never know, though */ + AFS_UNREACHED(ViceLog(0, ("BACK FROM ABORT\n"))); + AFS_UNREACHED(exit(1)); } /*! diff --git a/src/vol/salvaged.c b/src/vol/salvaged.c index b246831..07b3bbf 100644 --- a/src/vol/salvaged.c +++ b/src/vol/salvaged.c @@ -438,7 +438,7 @@ main(int argc, char **argv) err = cmd_Dispatch(argc, argv); Exit(err); - return 0; /* not reached */ + AFS_UNREACHED(return 0); } static void diff --git a/src/vol/salvager.c b/src/vol/salvager.c index 297ea3d..06eceb4 100644 --- a/src/vol/salvager.c +++ b/src/vol/salvager.c @@ -546,6 +546,6 @@ main(int argc, char **argv) cmd_AddParm(ts, "-f", CMD_FLAG, CMD_OPTIONAL, "Alias for -force"); err = cmd_Dispatch(argc, argv); Exit(err); - return 0; /* not reached */ + AFS_UNREACHED(return 0); } diff --git a/src/vol/salvsync-server.c b/src/vol/salvsync-server.c index d974152..63ed75e 100644 --- a/src/vol/salvsync-server.c +++ b/src/vol/salvsync-server.c @@ -832,7 +832,7 @@ FindHandler(osi_socket afd) } ReleaseReadLock(&SALVSYNC_handler_lock); /* just in case */ osi_Panic("Failed to find handler\n"); - return -1; /* satisfy compiler */ + AFS_UNREACHED(return -1); } static int @@ -844,7 +844,7 @@ FindHandler_r(osi_socket afd) return i; } osi_Panic("Failed to find handler\n"); - return -1; /* satisfy compiler */ + AFS_UNREACHED(return -1); } static int diff --git a/src/volser/volmain.c b/src/volser/volmain.c index de3c986..bc2c1fd 100644 --- a/src/volser/volmain.c +++ b/src/volser/volmain.c @@ -587,7 +587,7 @@ main(int argc, char **argv) if (!tdir) { Abort("volser: could not open conf files in %s\n", configDir); - VS_EXIT(1); + AFS_UNREACHED(VS_EXIT(1)); } /* initialize audit user check */ @@ -641,5 +641,5 @@ main(int argc, char **argv) osi_audit(VS_FinishEvent, (-1), AUD_END); Abort("StartServer returned?"); - return 0; /* not reached */ + AFS_UNREACHED(return 0); } -- 1.9.4