dir/vol: Die() really does

Die() is an abort routine shared by the dir and vol modules.  Move its
prototype into dir.h to ensure that its declaration matches its three
different definitions, and add an AFS_NORETURN annotation so that the
static analyzer knows that it aborts.

Change-Id: If01f35fe796708f6187b9767497a32458888ec1c
Reviewed-on: http://gerrit.openafs.org/5177
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/dir/buffer.c b/src/dir/buffer.c
index e903345..2197b27 100644 (file)
--- a/src/dir/buffer.c
+++ b/src/dir/buffer.c
@@ -93,8 +93,6 @@ extern void FidZap(dir_file_t);
 extern int  FidVolEq(dir_file_t, afs_int32 vid);
 extern void FidCpy(dir_file_t, dir_file_t fromfile);
 
-extern void Die(char *msg);
-
 int
 DStat(int *abuffers, int *acalls, int *aios)
 {

diff --git a/src/dir/dir.h b/src/dir/dir.h
index f5f98d7..3d1055a 100644 (file)
--- a/src/dir/dir.h
+++ b/src/dir/dir.h
@@ -84,6 +84,7 @@ typedef struct dcache * dir_file_t;
 #else
 struct DirHandle;
 typedef struct DirHandle * dir_file_t;
+extern void Die(const char *msg) AFS_NORETURN;
 #endif
 
 extern int afs_dir_NameBlobs(char *name);

diff --git a/src/dir/salvage.c b/src/dir/salvage.c
index d984c11..a20a67d 100644 (file)
--- a/src/dir/salvage.c
+++ b/src/dir/salvage.c
@@ -22,8 +22,6 @@
 /* Defined in vol/vol-salvage.c */
 extern void Log(const char *format, ...)
     AFS_ATTRIBUTE_FORMAT(__printf__, 1, 2);
-/* Defined in vol/physio.c */
-extern void Die(char *);
 
 #define printf Log             /* To make it work with volume salvager */
 

diff --git a/src/viced/viced.c b/src/viced/viced.c
index 6cc25ab..b36c2ea 100644 (file)
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -1521,7 +1521,7 @@ CheckParms(void)
 
 /* Miscellaneous routines */
 void
-Die(char *msg)
+Die(const char *msg)
 {
 
     ViceLogThenPanic(0, ("%s\n", msg));

diff --git a/src/vol/physio.c b/src/vol/physio.c
index d7191b9..c41584d 100644 (file)
--- a/src/vol/physio.c
+++ b/src/vol/physio.c
@@ -155,7 +155,7 @@ FidCpy(DirHandle * tofile, DirHandle * fromfile)
 }
 
 void
-Die(char *msg)
+Die(const char *msg)
 {
     printf("%s\n", msg);
     osi_Panic("%s\n", msg);

diff --git a/src/volser/physio.c b/src/volser/physio.c
index b988793..0045100 100644 (file)
--- a/src/volser/physio.c
+++ b/src/volser/physio.c
@@ -142,7 +142,7 @@ FidCpy(DirHandle * tofile, DirHandle * fromfile)
 }
 
 void
-Die(char *msg)
+Die(const char *msg)
 {
     printf("%s\n", msg);
     osi_Panic("%s\n", msg);