#error I need at least some 64-bit type
#endif
-#ifdef HAVE_LOCAL_NBD_H
+#ifdef NBD_H_LOCAL
#include "nbd.h"
-#else
-#ifdef HAVE_LINUX_NBD_H
-#include <linux/nbd.h>
-#else
-#error I need an nbd.h somewhere. Either install it in <linux/nbd.h> or put it in the current directory.
#endif
+#ifdef NBD_H_LINUX
+#include <linux/nbd.h>
#endif
#if NBD_LFS==1
{
const int maxlen = 150;
char s1[maxlen], *s2;
- int n = 0;
strncpy(s1, s, maxlen);
- if (s2 = strstr(s, "%m")) {
+ if ((s2 = strstr(s, "%m"))) {
strcpy(s1 + (s2 - s), strerror(errno));
s2 += 2;
strcpy(s1 + strlen(s1), s2);
}
#ifndef sun
/* Solaris doesn't have %h in syslog */
- else if (s2 = strstr(s, "%h")) {
+ else if ((s2 = strstr(s, "%h"))) {
strcpy(s1 + (s2 - s), hstrerror(h_errno));
s2 += 2;
strcpy(s1 + strlen(s1), s2);
s1[maxlen-1] = '\0';
#ifdef ISSERVER
- syslog(LOG_ERR, s1);
+ syslog(LOG_ERR, "%s", s1);
#else
fprintf(stderr, "Error: %s\n", s1);
#endif