Mercurial > dropbear
diff dbutil.h @ 1286:7d02b83c61fd coverity
merge
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Fri, 18 Mar 2016 22:47:33 +0800 |
parents | 3017bc7d6238 |
children | 750ec4ec4cbe efad433418c4 |
line wrap: on
line diff
--- a/dbutil.h Tue Mar 15 23:20:40 2016 +0800 +++ b/dbutil.h Fri Mar 18 22:47:33 2016 +0800 @@ -29,21 +29,12 @@ #include "includes.h" #include "buffer.h" #include "queue.h" +#include "dbhelpers.h" #ifndef DISABLE_SYSLOG void startsyslog(const char *ident); #endif -#ifdef __GNUC__ -#define ATTRIB_PRINTF(fmt,args) __attribute__((format(printf, fmt, args))) -#define ATTRIB_NORETURN __attribute__((noreturn)) -#define ATTRIB_SENTINEL __attribute__((sentinel)) -#else -#define ATTRIB_PRINTF(fmt,args) -#define ATTRIB_NORETURN -#define ATTRIB_SENTINEL -#endif - extern void (*_dropbear_exit)(int exitcode, const char* format, va_list param) ATTRIB_NORETURN; extern void (*_dropbear_log)(int priority, const char* format, va_list param); @@ -59,7 +50,7 @@ void dropbear_trace2(const char* format, ...) ATTRIB_PRINTF(1,2); void printhex(const char * label, const unsigned char * buf, int len); void printmpint(const char *label, mp_int *mp); -void debug_start_net(); +void debug_start_net(void); extern int debug_trace; #endif @@ -79,9 +70,8 @@ void * m_strdup(const char * str); void * m_realloc(void* ptr, size_t size); #define m_free(X) do {free(X); (X) = NULL;} while (0) -void m_burn(void* data, unsigned int len); void setnonblocking(int fd); -void disallow_core(); +void disallow_core(void); int m_str_to_uint(const char* str, unsigned int *val); /* Used to force mp_ints to be initialised */ @@ -95,7 +85,7 @@ /* Returns a time in seconds that doesn't go backwards - does not correspond to a real-world clock */ -time_t monotonic_now(); +time_t monotonic_now(void); char * expand_homedir_path(const char *inpath);