projects
/
nbd.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
b2de14b
)
fix build with non-gcc compiler
author
Wouter Verhelst <w@uter.be>
Thu, 19 Aug 2010 17:57:07 +0000
(19:57 +0200)
committer
Wouter Verhelst <w@uter.be>
Thu, 19 Aug 2010 17:57:47 +0000
(19:57 +0200)
Pulled from Alt Linu
Conflicts:
cliserv.h
cliserv.h
patch
|
blob
|
history
nbd-client.c
patch
|
blob
|
history
diff --git
a/cliserv.h
b/cliserv.h
index
61eaa6c
..
9004891
100644
(file)
--- a/
cliserv.h
+++ b/
cliserv.h
@@
-76,11
+76,12
@@
void setmysockopt(int sock) {
#endif
#endif
-void err_nonfatal(const char *s) {
- const int maxlen = 150;
- char s1[maxlen], *s2;
+void err(const char *s) G_GNUC_NORETURN;
+
+void err(const char *s) {
+ char s1[150], *s2;
- strncpy(s1, s, maxlen);
+ strncpy(s1, s, sizeof(s1));
if ((s2 = strstr(s, "%m"))) {
strcpy(s1 + (s2 - s), strerror(errno));
s2 += 2;
@@
-95,7
+96,7
@@
void err_nonfatal(const char *s) {
}
#endif
- s1[maxlen-1] = '\0';
+ s1[sizeof(s1)-1] = '\0';
#ifdef ISSERVER
syslog(LOG_ERR, "%s", s1);
syslog(LOG_ERR, "Exiting.");
diff --git
a/nbd-client.c
b/nbd-client.c
index
ba244ae
..
8fc39d5
100644
(file)
--- a/
nbd-client.c
+++ b/
nbd-client.c
@@
-37,10
+37,6
@@
#include <getopt.h>
#include <stdarg.h>
-#ifndef __GNUC__
-#error I need GCC to work
-#endif
-
#include <linux/ioctl.h>
#define MY_NAME "nbd_client"
#include "cliserv.h"