Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/libiproute/libnetlink.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/libiproute/libnetlink.c (modified) (3 diffs)

branches/3.3/mindi-busybox/networking/libiproute/libnetlink.c

@@ -72 +72 @@
     struct sockaddr_nl nladdr;
     struct iovec iov[2] = { { &nlh, sizeof(nlh) }, { req, len } };
+    /* Use designated initializers, struct layout is non-portable */
     struct msghdr msg = {
-        (void*)&nladdr, sizeof(nladdr),
-        iov,  2,
-        NULL, 0,
-        0
+        .msg_name = (void*)&nladdr,
+        .msg_namelen = sizeof(nladdr),
+        .msg_iov = iov,
+        .msg_iovlen = 2,
+        .msg_control = NULL,
+        .msg_controllen = 0,
+        .msg_flags = 0
     };
 
@@ -105 +109 @@
         int status;
         struct nlmsghdr *h;
-
+        /* Use designated initializers, struct layout is non-portable */
         struct msghdr msg = {
-            (void*)&nladdr, sizeof(nladdr),
-            &iov, 1,
-            NULL, 0,
-            0
+            .msg_name = (void*)&nladdr,
+            .msg_namelen = sizeof(nladdr),
+            .msg_iov = &iov,
+            .msg_iovlen = 1,
+            .msg_control = NULL,
+            .msg_controllen = 0,
+            .msg_flags = 0
         };
 
@@ -212 +219 @@
     struct iovec iov = { (void*)n, n->nlmsg_len };
     char   *buf = xmalloc(8*1024); /* avoid big stack buffer */
+    /* Use designated initializers, struct layout is non-portable */
     struct msghdr msg = {
-        (void*)&nladdr, sizeof(nladdr),
-        &iov, 1,
-        NULL, 0,
-        0
+        .msg_name = (void*)&nladdr,
+        .msg_namelen = sizeof(nladdr),
+        .msg_iov = &iov,
+        .msg_iovlen = 1,
+        .msg_control = NULL,
+        .msg_controllen = 0,
+        .msg_flags = 0
     };