sendmail: update from maintainer

[oweals/busybox.git] / networking / interface.c

diff --git a/networking/interface.c b/networking/interface.c
index 9e6ed63e05fdd9339e2ca96b4030cf32119e82d2..04d12b37e4e6695afeb2eebd9ede04dd0e0fe347 100644 (file)
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -248,7 +248,7 @@ static const struct aftype unspec_aftype = {
        .name   = "unspec",
        .title  = "UNSPEC",
        .af     = AF_UNSPEC,
-       .alen    = 0,
+       .alen   = 0,
        .print  = UNSPEC_print,
        .sprint = UNSPEC_sprint,
 };
@@ -405,24 +405,25 @@ static char *get_name(char *name, char *p)
        /* Extract <name> from nul-terminated p where p matches
           <name>: after leading whitespace.
           If match is not made, set name empty and return unchanged p */
-       int namestart=0, nameend=0;
+       int namestart = 0, nameend = 0;
+
        while (isspace(p[namestart]))
                namestart++;
-       nameend=namestart;
-       while (p[nameend] && p[nameend]!=':' && !isspace(p[nameend]))
+       nameend = namestart;
+       while (p[nameend] && p[nameend] != ':' && !isspace(p[nameend]))
                nameend++;
-       if (p[nameend]==':') {
-               if ((nameend-namestart)<IFNAMSIZ) {
-                       memcpy(name,&p[namestart],nameend-namestart);
-                       name[nameend-namestart]='\0';
-                       p=&p[nameend];
+       if (p[nameend] == ':') {
+               if ((nameend - namestart) < IFNAMSIZ) {
+                       memcpy(name, &p[namestart], nameend - namestart);
+                       name[nameend - namestart] = '\0';
+                       p = &p[nameend];
                } else {
                        /* Interface name too large */
-                       name[0]='\0';
+                       name[0] = '\0';
                }
        } else {
                /* trailing ':' not found - return empty */
-               name[0]='\0';
+               name[0] = '\0';
        }
        return p + 1;
 }
@@ -871,7 +872,7 @@ static int hw_null_address(const struct hwtype *hw, void *ap)
        return 1;
 }
 
-static const char TRext[] = "\0\0\0Ki\0Mi\0Gi\0Ti";
+static const char TRext[] ALIGN1 = "\0\0\0Ki\0Mi\0Gi\0Ti";
 
 static void print_bytes_scaled(unsigned long long ull, const char *end)
 {
@@ -937,7 +938,7 @@ static void ife_print(struct interface *ptr)
                        printf("(auto)");
        }
 #endif
-       puts("");
+       bb_putchar('\n');
 
        if (ptr->has_ip) {
                printf("          %s addr:%s ", ap->name,
@@ -1020,7 +1021,7 @@ static void ife_print(struct interface *ptr)
        if (ptr->flags == 0) {
                printf("[NO FLAGS] ");
        } else {
-               static const char ife_print_flags_strs[] =
+               static const char ife_print_flags_strs[] ALIGN1 =
                        "UP\0"
                        "BROADCAST\0"
                        "DEBUG\0"
@@ -1038,7 +1039,7 @@ static void ife_print(struct interface *ptr)
                        "DYNAMIC\0"
 #endif
                        ;
-               static const unsigned short ife_print_flags_mask[] = {
+               static const unsigned short ife_print_flags_mask[] ALIGN2 = {
                        IFF_UP,
                        IFF_BROADCAST,
                        IFF_DEBUG,
@@ -1051,9 +1052,9 @@ static void ife_print(struct interface *ptr)
                        IFF_ALLMULTI,
                        IFF_SLAVE,
                        IFF_MASTER,
-                       IFF_MULTICAST,
+                       IFF_MULTICAST
 #ifdef HAVE_DYNAMIC
-                       IFF_DYNAMIC,
+                       ,IFF_DYNAMIC
 #endif
                };
                const unsigned short *mask = ife_print_flags_mask;
@@ -1073,7 +1074,7 @@ static void ife_print(struct interface *ptr)
        if (ptr->outfill || ptr->keepalive)
                printf("  Outfill:%d  Keepalive:%d", ptr->outfill, ptr->keepalive);
 #endif
-       puts("");
+       bb_putchar('\n');
 
        /* If needed, display the interface statistics. */
 
@@ -1122,9 +1123,9 @@ static void ife_print(struct interface *ptr)
                }
                if (ptr->map.dma)
                        printf("DMA chan:%x ", ptr->map.dma);
-               puts("");
+               bb_putchar('\n');
        }
-       puts("");
+       bb_putchar('\n');
 }