sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r14751: Use the noreturn attribute to try and tell coverity that

Browse Source 
smb_panic can't return.
Jeremy.
(This used to be commit ba9c98983e)
This commit is contained in:
Jeremy Allison 2006-03-28 15:50:13 +00:00 committed by Gerald (Jerry) Carter
parent fe05699b00
commit 80afbe5cf5
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source3/include/includes.h
View File

@ -1553,4 +1553,13 @@ LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to);
#define CONST_DISCARD(type, ptr) ((type) ((void *) (ptr)))
#define CONST_ADD(type, ptr) ((type) ((const void *) (ptr)))
#ifndef NORETURN_ATTRIBUTE
#if (__GNUC__ >= 3)
#define NORETURN_ATTRIBUTE __attribute__ ((noreturn))
#else
#define NORETURN_ATTRIBUTE
#endif
#endif
void smb_panic( const char *why ) NORETURN_ATTRIBUTE ;
#endif /* _INCLUDES_H */

21
source3/lib/util.c
View File

@ -1541,14 +1541,6 @@ gid_t nametogid(const char *name)
return (gid_t)-1;
}
/*******************************************************************
legacy wrapper for smb_panic2()
********************************************************************/
void smb_panic( const char *why )
{
smb_panic2( why, True );
}
/*******************************************************************
Something really nasty happened - panic !
********************************************************************/
@ -1557,7 +1549,7 @@ void smb_panic( const char *why )
#include <libexc.h>
#endif
void smb_panic2(const char *why, BOOL decrement_pid_count )
static void smb_panic2(const char *why, BOOL decrement_pid_count )
{
char *cmd;
int result;
@ -1663,6 +1655,17 @@ void smb_panic2(const char *why, BOOL decrement_pid_count )
abort();
}
/*******************************************************************
wrapper for smb_panic2()
********************************************************************/
void smb_panic( const char *why )
{
smb_panic2( why, True );
/* Notreached. */
abort();
}
/*******************************************************************
A readdir wrapper which just returns the file name.
********************************************************************/