Make insmod quiet by default (patch from Yann E. Morin).

[oweals/busybox.git] / e2fsprogs / e2p / feature.c

diff --git a/e2fsprogs/e2p/feature.c b/e2fsprogs/e2p/feature.c
index ef11d93b794bda795afda4f26e9f795b15363371..fe6016102cb8718702984b182653fa8a9c509d6f 100644 (file)
--- a/e2fsprogs/e2p/feature.c
+++ b/e2fsprogs/e2p/feature.c
@@ -22,7 +22,7 @@ struct feature {
        const char      *string;
 };
 
-static struct feature feature_list[] = {
+static const struct feature feature_list[] = {
        {       E2P_FEATURE_COMPAT, EXT2_FEATURE_COMPAT_DIR_PREALLOC,
                        "dir_prealloc" },
        {       E2P_FEATURE_COMPAT, EXT3_FEATURE_COMPAT_HAS_JOURNAL,
@@ -56,10 +56,10 @@ static struct feature feature_list[] = {
 
 const char *e2p_feature2string(int compat, unsigned int mask)
 {
-       struct feature  *f;
+       const struct feature *f;
        static char buf[20];
-       char    fchar;
-       int     fnum;
+       char fchar;
+       int fnum;
 
        for (f = feature_list; f->string; f++) {
                if ((compat == f->compat) &&
@@ -67,7 +67,7 @@ const char *e2p_feature2string(int compat, unsigned int mask)
                        return f->string;
        }
        switch (compat) {
-       case  E2P_FEATURE_COMPAT:
+       case E2P_FEATURE_COMPAT:
                fchar = 'C';
                break;
        case E2P_FEATURE_INCOMPAT:
@@ -81,15 +81,15 @@ const char *e2p_feature2string(int compat, unsigned int mask)
                break;
        }
        for (fnum = 0; mask >>= 1; fnum++);
-       sprintf(buf, "FEATURE_%c%d", fchar, fnum);
+               sprintf(buf, "FEATURE_%c%d", fchar, fnum);
        return buf;
 }
 
 int e2p_string2feature(char *string, int *compat_type, unsigned int *mask)
 {
-       struct feature  *f;
-       char            *eptr;
-       int             num;
+       const struct feature *f;
+       char *eptr;
+       int num;
 
        for (f = feature_list; f->string; f++) {
                if (!strcasecmp(string, f->string)) {
@@ -128,14 +128,14 @@ int e2p_string2feature(char *string, int *compat_type, unsigned int *mask)
        return 0;
 }
 
-static char *skip_over_blanks(char *cp)
+static inline char *skip_over_blanks(char *cp)
 {
        while (*cp && isspace(*cp))
                cp++;
        return cp;
 }
 
-static char *skip_over_word(char *cp)
+static inline char *skip_over_word(char *cp)
 {
        while (*cp && !isspace(*cp) && *cp != ',')
                cp++;
@@ -154,10 +154,7 @@ int e2p_edit_feature(const char *str, __u32 *compat_array, __u32 *ok_array)
        unsigned int    mask;
        int             compat_type;
 
-       buf = malloc(strlen(str)+1);
-       if (!buf)
-               return 1;
-       strcpy(buf, str);
+       buf = bb_xstrdup(str);
        cp = buf;
        while (cp && *cp) {
                neg = 0;
@@ -187,4 +184,3 @@ int e2p_edit_feature(const char *str, __u32 *compat_array, __u32 *ok_array)
        }
        return 0;
 }
-