Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/networking/libiproute/ll_proto.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_proto.c (modified) (4 diffs)

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

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ll_proto.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>
  */
 
@@ -20 +18 @@
 #include <linux/if_ether.h>
 #endif
+
+#if !ENABLE_WERROR
+#warning de-bloat
+#endif
+/* Before re-enabling this, please (1) conditionalize exotic protocols
+ * on CONFIG_something, and (2) decouple strings and numbers
+ * (use llproto_ids[] = n,n,n..; and llproto_names[] = "loop\0" "pup\0" ...;)
+ */
 
 #define __PF(f,n) { ETH_P_##f, #n },
@@ -91 +97 @@
 
 
-const char * ll_proto_n2a(unsigned short id, char *buf, int len)
+const char* FAST_FUNC ll_proto_n2a(unsigned short id, char *buf, int len)
 {
-    int i;
-
+    unsigned i;
     id = ntohs(id);
-
-    for (i=0; i < ARRAY_SIZE(llproto_names); i++) {
+    for (i = 0; i < ARRAY_SIZE(llproto_names); i++) {
          if (llproto_names[i].id == id)
             return llproto_names[i].name;
@@ -105 +109 @@
 }
 
-int ll_proto_a2n(unsigned short *id, char *buf)
+int FAST_FUNC ll_proto_a2n(unsigned short *id, char *buf)
 {
-    int i;
-    for (i=0; i < ARRAY_SIZE(llproto_names); i++) {
+    unsigned i;
+    for (i = 0; i < ARRAY_SIZE(llproto_names); i++) {
          if (strcasecmp(llproto_names[i].name, buf) == 0) {
-             *id = htons(llproto_names[i].id);
-             return 0;
+             i = llproto_names[i].id;
+             goto good;
          }
     }
-    if (get_u16(id, buf, 0))
+    i = bb_strtou(buf, NULL, 0);
+    if (errno || i > 0xffff)
         return -1;
-    *id = htons(*id);
+ good:
+    *id = htons(i);
     return 0;
 }