projects
/
nbd.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Be explicit when we exit
[nbd.git]
/
cliserv.h
diff --git
a/cliserv.h
b/cliserv.h
index
49dffca
..
77310c3
100644
(file)
--- a/
cliserv.h
+++ b/
cliserv.h
@@
-42,8
+42,13
@@
typedef unsigned long long u64;
#include "nbd.h"
#endif
#ifdef NBD_H_LINUX
#include "nbd.h"
#endif
#ifdef NBD_H_LINUX
-#include <linux/types.h>
-#include <linux/nbd.h>
+# ifdef HAVE_LINUX_TYPES_H
+# include <linux/types.h>
+# else
+# define __be32 u32
+# define __be64 u64
+# endif
+# include <linux/nbd.h>
#endif
#if NBD_LFS==1
#endif
#if NBD_LFS==1
@@
-74,6
+79,16
@@
void setmysockopt(int sock) {
#endif
}
#endif
}
+#ifndef G_GNUC_NORETURN
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
+#define G_GNUC_NORETURN __attribute__((__noreturn__))
+#else
+#define G_GNUC_NORETURN
+#endif
+#endif
+
+void err(const char *s) G_GNUC_NORETURN;
+
void err(const char *s) {
const int maxlen = 150;
char s1[maxlen], *s2;
void err(const char *s) {
const int maxlen = 150;
char s1[maxlen], *s2;
@@
-96,8
+111,9
@@
void err(const char *s) {
s1[maxlen-1] = '\0';
#ifdef ISSERVER
syslog(LOG_ERR, "%s", s1);
s1[maxlen-1] = '\0';
#ifdef ISSERVER
syslog(LOG_ERR, "%s", s1);
+ syslog(LOG_ERR, "Exiting.");
#endif
#endif
- fprintf(stderr, "Error: %s\n", s1);
+ fprintf(stderr, "Error: %s\nExiting.\n", s1);
exit(1);
}
exit(1);
}