Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/networking/libiproute/ll_addr.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/networking/libiproute/ll_addr.c (modified) (4 diffs)

branches/2.2.9/mindi-busybox/networking/libiproute/ll_addr.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ll_addr.c
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
@@ -18 +16 @@
 
 
-const char *ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int blen)
+const char* FAST_FUNC ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int blen)
 {
     int i;
     int l;
 
-    if (alen == 4 &&
-        (type == ARPHRD_TUNNEL || type == ARPHRD_SIT || type == ARPHRD_IPGRE)) {
+    if (alen == 4
+     && (type == ARPHRD_TUNNEL || type == ARPHRD_SIT || type == ARPHRD_IPGRE)
+    ) {
         return inet_ntop(AF_INET, addr, buf, blen);
     }
     l = 0;
-    for (i=0; i<alen; i++) {
-        if (i==0) {
-            snprintf(buf+l, blen, ":%02x"+1, addr[i]);
+    for (i = 0; i < alen; i++) {
+        if (i == 0) {
+            snprintf(buf + l, blen, ":%02x"+1, addr[i]);
             blen -= 2;
             l += 2;
         } else {
-            snprintf(buf+l, blen, ":%02x", addr[i]);
+            snprintf(buf + l, blen, ":%02x", addr[i]);
             blen -= 3;
             l += 3;
@@ -42 +41 @@
 }
 
-int ll_addr_a2n(unsigned char *lladdr, int len, char *arg)
+int FAST_FUNC ll_addr_a2n(unsigned char *lladdr, int len, char *arg)
 {
+    int i;
+
     if (strchr(arg, '.')) {
         inet_prefix pfx;
@@ -55 +56 @@
         memcpy(lladdr, pfx.data, 4);
         return 4;
-    } else {
-        int i;
+    }
 
-        for (i=0; i<len; i++) {
-            int temp;
-            char *cp = strchr(arg, ':');
-            if (cp) {
-                *cp = 0;
-                cp++;
-            }
-            if (sscanf(arg, "%x", &temp) != 1) {
-                bb_error_msg("\"%s\" is invalid lladdr", arg);
-                return -1;
-            }
-            if (temp < 0 || temp > 255) {
-                bb_error_msg("\"%s\" is invalid lladdr", arg);
-                return -1;
-            }
-            lladdr[i] = temp;
-            if (!cp) {
-                break;
-            }
-            arg = cp;
+    for (i = 0; i < len; i++) {
+        int temp;
+        char *cp = strchr(arg, ':');
+        if (cp) {
+            *cp = 0;
+            cp++;
         }
-        return i+1;
+        if (sscanf(arg, "%x", &temp) != 1 || (temp < 0 || temp > 255)) {
+            bb_error_msg("\"%s\" is invalid lladdr", arg);
+            return -1;
+        }
+        lladdr[i] = temp;
+        if (!cp) {
+            break;
+        }
+        arg = cp;
     }
+    return i+1;
 }