commit c7212d0365c02806b9790672838aafd04a7631e3
author Andreas Schneider <asn@cryptomilk.org> Mon Jan 26 22:45:26 2015 +0100
committer Ethan Chen <intervigil@gmail.com> Tue Jan 27 14:44:04 2015 -0800
tree 1bbf9e107f1e0cf4ff839a171c6767e570698d93
parent 3a73bd3f2ebf9caf14a0aec8e8529033c06803a2

macloader: Use a variable for device type.

Change-Id: Ice29862ad6aaa15b07d6341893b0b8f1c65152e6
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>

macloader/macloader.c

diff --git a/macloader/macloader.c b/macloader/macloader.c
index b8275a5..0132651 100644
--- a/macloader/macloader.c
+++ b/macloader/macloader.c
@@ -120,6 +120,7 @@
     }
 
     if (type != NONE) {
+        const char *type_str;
         struct passwd *pwd;
         int fd;
 
@@ -134,37 +135,29 @@
         switch(type) {
             case NONE:
                 return -1;
-            break;
             case MURATA:
-                /* write murata to cid file */
-                ALOGI("Writing murata to %s\n", CID_PATH);
-                ret = fputs("murata", cidfile);
-            break;
+                type_str = "murata";
+                break;
             case SEMCOSH:
-                /* write semcosh to cid file */
-                ALOGI("Writing semcosh to %s\n", CID_PATH);
-                ret = fputs("semcosh", cidfile);
-            break;
+                type_str = "semcosh";
+                break;
             case SEMCOVE:
-                /* write semcove to cid file */
-                ALOGI("Writing semcove to %s\n", CID_PATH);
-                ret = fputs("semcove", cidfile);
-            break;
+                type_str = "semcove";
+                break;
             case SEMCO3RD:
-                ALOGI("Writing semco3rd to %s\n", CID_PATH);
-                ret = fputs("semco3rd", cidfile);
+                type_str = "semco3rd";
             break;
             case SEMCO:
-                /* write semco to cid file */
-                ALOGI("Writing semco to %s\n", CID_PATH);
-                ret = fputs("semco", cidfile);
-            break;
+                type_str = "semco";
+                break;
             case WISOL:
-                ALOGI("Writing wisol to %s\n", CID_PATH);
-                ret = fputs("wisol", cidfile);
+                type_str = "wisol";
             break;
-         }
+        }
 
+        ALOGI("Settting wifi type to %s in %s\n", type_str, CID_PATH);
+
+        ret = fputs(type_str, cidfile);
         if (ret != 0) {
             fprintf(stderr, "fputs() to file %s failed\n", CID_PATH);
             ALOGE("Can't write to %s\n", CID_PATH);