#endif
#ifdef NBD_H_LOCAL
+/* 2.6.18 and above use __be* rather than u* */
+#define __be32 u32
+#define __be64 u64
#include "nbd.h"
#endif
#ifdef NBD_H_LINUX
+#include <linux/types.h>
#include <linux/nbd.h>
#endif
#define INFO(a) do { } while(0)
-void setmysockopt(int sock)
-{
+void setmysockopt(int sock) {
int size = 1;
#if 0
if (setsockopt(sock, SOL_SOCKET, SO_SNDBUF, &size, sizeof(int)) < 0)
#endif
}
-void err(const char *s)
-{
+void err(const char *s) {
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);
exit(1);
}
-void logging(void)
-{
+void logging(void) {
#ifdef ISSERVER
openlog(MY_NAME, LOG_PID, LOG_DAEMON);
#endif
}
#ifdef WORDS_BIGENDIAN
-u64 ntohll(u64 a)
-{
+u64 ntohll(u64 a) {
return a;
}
#else
-u64 ntohll(u64 a)
-{
+u64 ntohll(u64 a) {
u32 lo = a & 0xffffffff;
u32 hi = a >> 32U;
lo = ntohl(lo);