Header cleanup on two more networking files (move libbb.h to the top and

[oweals/busybox.git] / miscutils / devfsd.c

diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index fce63e54dd1f0c048160430db187b773153938d1..aa682dc0dfbb7c7e5f51cf7d107806990c17956f 100644 (file)
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -57,7 +57,6 @@
 #include <stdarg.h>
 #include <string.h>
 #include <ctype.h>
-#include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -606,17 +605,18 @@ static void process_config_line (const char *line, unsigned long *event_mask)
        char name[STRING_LENGTH];
        char * msg="";
        char *ptr;
+       int i;
 
        /* !!!! Only Uppercase Keywords in devsfd.conf */
-       const char *options[] = {       "CLEAR_CONFIG", "INCLUDE", "OPTIONAL_INCLUDE", "RESTORE",
-                                                               "PERMISSIONS", "MODLOAD", "EXECUTE", "COPY", "IGNORE",
-                                                               "MKOLDCOMPAT", "MKNEWCOMPAT","RMOLDCOMPAT", "RMNEWCOMPAT", 0 };
-
-       int i;
+       static const char *const options[] = {
+               "CLEAR_CONFIG", "INCLUDE", "OPTIONAL_INCLUDE",
+               "RESTORE", "PERMISSIONS", "MODLOAD", "EXECUTE",
+               "COPY", "IGNORE", "MKOLDCOMPAT", "MKNEWCOMPAT",
+               "RMOLDCOMPAT", "RMNEWCOMPAT", 0
+       };
 
        debug_msg_logger(LOG_INFO, __FUNCTION__);
 
-
        for (count = 0; count < MAX_ARGS; ++count) p[count][0] = '\0';
        num_args = sscanf (line, "%s %s %s %s %s %s %s %s %s %s",
                        when, name, what,
@@ -678,7 +678,7 @@ static void process_config_line (const char *line, unsigned long *event_mask)
                        if ( ( ptr = strchr (p[0], '.') ) == NULL )
                        {
                                msg="UID.GID";
-                               goto process_config_line_err; /*"missing '.' in UID.GID */
+                               goto process_config_line_err; /*"missing '.' in UID.GID"*/
                        }
 
                        *ptr++ = '\0';
@@ -871,7 +871,7 @@ static void action_permissions (const struct devfsd_notify_struct *info,
 }   /*  End Function action_permissions  */
 
 static void action_modload (const struct devfsd_notify_struct *info,
-                           const struct config_entry_struct *entry)
+                           const struct config_entry_struct *entry ATTRIBUTE_UNUSED)
 /*  [SUMMARY] Load a module.
     <info> The devfs change.
     <entry> The config file entry.
@@ -993,17 +993,19 @@ static void action_compat (const struct devfsd_notify_struct *info, unsigned int
        unsigned int i;
        char rewind_;
        /* 1 to 5  "scsi/" , 6 to 9 "ide/host" */
-       const char *fmt[] = {   NULL ,
-                                                       "sg/c%db%dt%du%d",                      /* scsi/generic */
-                                                       "sd/c%db%dt%du%d",                      /* scsi/disc */
-                                                       "sr/c%db%dt%du%d",                      /* scsi/cd */
-                                                       "sd/c%db%dt%du%dp%d",           /* scsi/part */
-                                                       "st/c%db%dt%du%dm%d%c",         /* scsi/mt */
-                                                       "ide/hd/c%db%dt%du%d",          /* ide/host/disc */
-                                                       "ide/cd/c%db%dt%du%d",          /* ide/host/cd */
-                                                       "ide/hd/c%db%dt%du%dp%d",       /* ide/host/part */
-                                                       "ide/mt/c%db%dt%du%d%s",        /* ide/host/mt */
-                                                       NULL };
+       static const char *const fmt[] = {
+               NULL ,
+               "sg/c%db%dt%du%d",              /* scsi/generic */
+               "sd/c%db%dt%du%d",              /* scsi/disc */
+               "sr/c%db%dt%du%d",              /* scsi/cd */
+               "sd/c%db%dt%du%dp%d",           /* scsi/part */
+               "st/c%db%dt%du%dm%d%c",         /* scsi/mt */
+               "ide/hd/c%db%dt%du%d",          /* ide/host/disc */
+               "ide/cd/c%db%dt%du%d",          /* ide/host/cd */
+               "ide/hd/c%db%dt%du%dp%d",       /* ide/host/part */
+               "ide/mt/c%db%dt%du%d%s",        /* ide/host/mt */
+               NULL
+       };
 
        /*  First construct compatibility name  */
        switch (action)
@@ -1596,20 +1598,22 @@ const char *get_old_name (const char *devname, unsigned int namelen,
        const char *pty2;
        size_t len;
        /* 1 to 5  "scsi/" , 6 to 9 "ide/host", 10 sbp/, 11 vcc/, 12 pty/ */
-       const char *fmt[] = {   NULL ,
-                                                       "sg%u",                 /* scsi/generic */
-                                                       NULL,                   /* scsi/disc */
-                                                       "sr%u",                 /* scsi/cd */
-                                                       NULL,                   /* scsi/part */
-                                                       "nst%u%c",              /* scsi/mt */
-                                                       "hd%c"  ,               /* ide/host/disc */
-                                                       "hd%c"  ,               /* ide/host/cd */
-                                                       "hd%c%s",               /* ide/host/part */
-                                                       "%sht%d",               /* ide/host/mt */
-                                                       "sbpcd%u",              /* sbp/ */
-                                                       "vcs%s",                /* vcc/ */
-                                                       "%cty%c%c",             /* pty/ */
-                                                       NULL };
+       static const char *const fmt[] = {
+               NULL ,
+               "sg%u",                 /* scsi/generic */
+               NULL,                   /* scsi/disc */
+               "sr%u",                 /* scsi/cd */
+               NULL,                   /* scsi/part */
+               "nst%u%c",              /* scsi/mt */
+               "hd%c"  ,               /* ide/host/disc */
+               "hd%c"  ,               /* ide/host/cd */
+               "hd%c%s",               /* ide/host/part */
+               "%sht%d",               /* ide/host/mt */
+               "sbpcd%u",              /* sbp/ */
+               "vcs%s",                /* vcc/ */
+               "%cty%c%c",             /* pty/ */
+               NULL
+       };
 
        debug_msg_logger(LOG_INFO, __FUNCTION__);
 
@@ -1705,7 +1709,7 @@ static char get_old_ide_name (unsigned int major, unsigned int minor)
                        i==IDE6_MAJOR || i==IDE7_MAJOR || i==IDE8_MAJOR ||
                        i==IDE9_MAJOR )
                {
-                       if(i==major)
+                       if((unsigned int)i==major)
                        {
                                letter=c;
                                break;
@@ -1901,7 +1905,7 @@ static const char *expand_variable (char *buffer, unsigned int length,
                for (ptr = input; isalnum (ch) || (ch == '_') || (ch == ':');ch = *++ptr)
                        /* VOID */ ;
                len = ptr - input;
-               if (len >= sizeof tmp)
+               if ((size_t)len >= sizeof tmp)
                        goto expand_variable_out;
 
                safe_memcpy (tmp, input, len);
@@ -1927,7 +1931,7 @@ static const char *expand_variable (char *buffer, unsigned int length,
        {
                /*  Must be simple variable expansion with "${var}"  */
                len = ptr - input;
-               if (len >= sizeof tmp)
+               if ((size_t)len >= sizeof tmp)
                        goto expand_variable_out;
 
                safe_memcpy (tmp, input, len);
@@ -1943,7 +1947,7 @@ static const char *expand_variable (char *buffer, unsigned int length,
        }
        /*  It's that handy "${var:-word}" expression. Check if var is defined  */
        len = ptr - input;
-       if (len >= sizeof tmp)
+       if ((size_t)len >= sizeof tmp)
                goto expand_variable_out;
 
        safe_memcpy (tmp, input, len);
@@ -1988,7 +1992,7 @@ static const char *expand_variable (char *buffer, unsigned int length,
        pointer to start of word in "${var:-word}"  */
        input += 2;
        len = ptr - input;
-       if (len >= sizeof tmp)
+       if ((size_t)len >= sizeof tmp)
                goto expand_variable_out;
 
        safe_memcpy (tmp, input, len);