r203: codingstyle cleanup

[nbd.git] / cliserv.h

diff --git a/cliserv.h b/cliserv.h
index ebcb036..2d52591 100644 (file)
--- a/cliserv.h
+++ b/cliserv.h
@@ -35,14 +35,14 @@ typedef unsigned long long u64;
 #error I need at least some 64-bit type
 #endif
 
-#ifdef HAVE_LOCAL_NBD_H
+#define __be32 u32
+#define __be64 u64
+
+#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
@@ -55,8 +55,7 @@ u64 cliserv_magic = 0x00420281861253LL;
 
 #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)
@@ -74,21 +73,19 @@ void setmysockopt(int sock)
 #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);
@@ -104,8 +101,7 @@ void err(const char *s)
        exit(1);
 }
 
-void logging(void)
-{
+void logging(void) {
 #ifdef ISSERVER
        openlog(MY_NAME, LOG_PID, LOG_DAEMON);
 #endif
@@ -114,13 +110,11 @@ void logging(void)
 }
 
 #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);