Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/nbd-client.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/nbd-client.c (modified) (2 diffs)

branches/3.3/mindi-busybox/networking/nbd-client.c

@@ -58 +58 @@
         char data[124];
     } nbd_header;
-    struct bug_check {
-        char c[offsetof(struct nbd_header_t, data) == 8+8+8+4 ? 1 : -1];
-    };
+
+    BUILD_BUG_ON(offsetof(struct nbd_header_t, data) != 8+8+8+4);
 
     // Parse command line stuff (just a stub now)
@@ -84 +83 @@
         // Find and connect to server
         sock = create_and_connect_stream_or_die(host, xatou16(port));
-        setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &const_int_1, sizeof(const_int_1));
+        setsockopt_1(sock, IPPROTO_TCP, TCP_NODELAY);
 
         // Log on to the server