Remove double "it", and redundant information about defaults

[nbd.git] / cliserv.h

diff --git a/cliserv.h b/cliserv.h
index 67bac4b..09cb3d6 100644 (file)
--- a/cliserv.h
+++ b/cliserv.h
@@ -40,7 +40,12 @@ typedef unsigned long long u64;
 #include "nbd.h"
 
 #if NBD_LFS==1
 #include "nbd.h"
 
 #if NBD_LFS==1

+/* /usr/include/features.h (included from /usr/include/sys/types.h)
+   defines this when _GNU_SOURCE is defined
+ */
+#ifndef _LARGEFILE_SOURCE

 #define _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE

+#endif

 #define _FILE_OFFSET_BITS 64
 #endif
 
 #define _FILE_OFFSET_BITS 64
 #endif
 

@@ -71,16 +76,17 @@ void setmysockopt(int sock) {
 #ifndef G_GNUC_NORETURN
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
 #define G_GNUC_NORETURN __attribute__((__noreturn__))
 #ifndef G_GNUC_NORETURN
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
 #define G_GNUC_NORETURN __attribute__((__noreturn__))

+#define G_GNUC_UNUSED __attribute__((unused))

 #else
 #define G_GNUC_NORETURN
 #else
 #define G_GNUC_NORETURN

+#define G_GNUC_UNUSED

 #endif
 #endif
 
 void err_nonfatal(const char *s) {
 #endif
 #endif
 
 void err_nonfatal(const char *s) {

-       const int maxlen = 150;
-       char s1[maxlen], *s2;
+       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;
        if ((s2 = strstr(s, "%m"))) {
                strcpy(s1 + (s2 - s), strerror(errno));
                s2 += 2;

@@ -95,7 +101,7 @@ void err_nonfatal(const char *s) {
        }
 #endif
 
        }
 #endif
 

-       s1[maxlen-1] = '\0';
+       s1[sizeof(s1)-1] = '\0';

 #ifdef ISSERVER
        syslog(LOG_ERR, "%s", s1);
        syslog(LOG_ERR, "Exiting.");
 #ifdef ISSERVER
        syslog(LOG_ERR, "%s", s1);
        syslog(LOG_ERR, "Exiting.");

@@ -133,11 +139,7 @@ u64 ntohll(u64 a) {
 #endif
 #define htonll ntohll
 
 #endif
 #define htonll ntohll
 

-/* Flags used between the client and server */
-#define NBD_FLAG_HAS_FLAGS     (1 << 0)        /* Flags are there */
-#define NBD_FLAG_READ_ONLY     (1 << 1)        /* Device is read-only */
-
-#define NBD_DEFAULT_PORT       "12345" /* Port on which named exports are
+#define NBD_DEFAULT_PORT       "10809" /* Port on which named exports are

                                         * served */
 
 /* Options that the client can select to the server */
                                         * served */
 
 /* Options that the client can select to the server */