From: Wouter Verhelst <w@uter.be>
Date: Thu, 19 Aug 2010 17:57:07 +0000 (+0200)
Subject: fix build with non-gcc compiler
X-Git-Url: http://git.alex.org.uk

fix build with non-gcc compiler

Pulled from Alt Linu

Conflicts:

	cliserv.h
---

diff --git a/cliserv.h b/cliserv.h
index 61eaa6c..9004891 100644
--- 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
--- 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"