Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/networking/libiproute/ll_proto.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/networking/libiproute/ll_proto.c (modified) (5 diffs)

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

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * ll_proto.c
@@ -11 +12 @@
 
 #include "libbb.h"
-#include <string.h>
-
 #include "rt_names.h"
 #include "utils.h"
 
-#if __GLIBC__ >=2 && __GLIBC_MINOR >= 1
+#if defined(__GLIBC__) && __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1
 #include <net/ethernet.h>
 #else
@@ -25 +24 @@
 static struct {
     int id;
-    char *name;
+    const char *name;
 } llproto_names[] = {
 __PF(LOOP,loop)
@@ -98 +97 @@
     id = ntohs(id);
 
-    for (i=0; i<sizeof(llproto_names)/sizeof(llproto_names[0]); i++) {
+    for (i=0; i < ARRAY_SIZE(llproto_names); i++) {
          if (llproto_names[i].id == id)
             return llproto_names[i].name;
@@ -109 +108 @@
 {
     int i;
-    for (i=0; i<sizeof(llproto_names)/sizeof(llproto_names[0]); i++) {
+    for (i=0; i < ARRAY_SIZE(llproto_names); i++) {
          if (strcasecmp(llproto_names[i].name, buf) == 0) {
              *id = htons(llproto_names[i].id);