From 7fe4125fe3435092b75ed29b884d8d3c2d1a2cad Mon Sep 17 00:00:00 2001 From: Garrett Wollman Date: Mon, 8 Aug 2011 23:19:22 -0400 Subject: [PATCH] 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 Reviewed-by: Simon Wilkinson Reviewed-by: Derrick Brashear --- src/dir/buffer.c | 2 -- src/dir/dir.h | 1 + src/dir/salvage.c | 2 -- src/viced/viced.c | 2 +- src/vol/physio.c | 2 +- src/volser/physio.c | 2 +- 6 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/dir/buffer.c b/src/dir/buffer.c index e90334529..2197b2766 100644 --- 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 f5f98d7c5..3d1055a0a 100644 --- 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 d984c118f..a20a67dad 100644 --- 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 6cc25aba1..b36c2ea84 100644 --- 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 d7191b9c2..c41584de1 100644 --- 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 b988793e0..00451004c 100644 --- 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); -- 2.39.5