readability improvements

Author: madelinespark

client/castApp/src/castinit.c

@@ -201,8 +201,7 @@ static void addReccasterEnvVarsCallFunc(const iocshArgBuf *args)
 }
 
 void addReccasterExcludePattern(caster_t* self, int argc, char **argv) {
-    size_t i;
-    int ret = 0;
+    // size_t i;
     argv++; argc--; /* skip function arg */
     if (argc < 1) {
         errlogSevPrintf(errlogMinor, "At least one argument expected for addReccasterExcludePattern\n");
@@ -221,44 +220,38 @@ void addReccasterExcludePattern(caster_t* self, int argc, char **argv) {
         return;
     }
 
-    for (i = 0; i < argc; i++) {
-        if (strcmp(argv[i], "") == 0) {
-            errlogSevPrintf(errlogMinor, "Arg is empty for addReccasterExcludePattern\n");
+    for (int i = 0; i < argc; i++) {
+        if (argv[i][0] == '\0') {
+            errlogSevPrintf(errlogMajor, "Arg is empty for addReccasterExcludePattern\n");
+            continue;
         }
         /* check duplicates */
-        else {
-            int dup = 0;
-            ELLNODE *cur = ellFirst(&self->exclude_patterns);
-            while (cur != NULL) {
-                string_list_t *temp = (string_list_t *)cur;
-                if (strcmp(argv[i], temp->item_str) == 0) {
-                    errlogSevPrintf(errlogMinor, "Duplicate pattern %s\n", argv[i]);
-                    dup = 1;
-                    break;
-                }
-                cur = ellNext(cur);
-            }
-            if (!dup) {
-                string_list_t *new = malloc(sizeof(string_list_t));
-                if (new == NULL) {
-                    errlogSevPrintf(errlogMajor, "malloc error for creating linked list node");
-                    ret = 1;
-                    break;
-                }
-                new->item_str = strdup(argv[i]);
-                if (new->item_str == NULL) {
-                    errlogSevPrintf(errlogMinor, "strdup error for copying %s to new->item_str from addReccasterExcludePattern\n", argv[i]);
-                    free(new);  /* frees if strdup fails */
-                    ret = 1;
-                    break;
-                }
-                ellAdd(&self->exclude_patterns, &new->node);
+        int dup = 0;
+        ELLNODE *cur = ellFirst(&self->exclude_patterns);
+        while (cur != NULL) {
+            string_list_t *temp = (string_list_t *)cur;
+            if (strcmp(argv[i], temp->item_str) == 0) {
+                dup = 1;
+                break;
             }
+            cur = ellNext(cur);
         }
-    }
-
-    if (ret) {
-        errlogSevPrintf(errlogMajor, "Error in addReccasterExcludePattern - exclude patterns may not be set\n");
+        if (dup) {
+            errlogSevPrintf(errlogMinor, "Duplicate pattern %s in addReccasterExcludePattern\n", argv[i]);
+            continue;
+        }
+        string_list_t *new = malloc(sizeof(string_list_t));
+        if (new == NULL) {
+            errlogSevPrintf(errlogMajor, "Error in addReccasterExcludePattern - malloc error for creating linked list node");
+            break;
+        }
+        new->item_str = strdup(argv[i]);
+        if (new->item_str == NULL) {
+            errlogSevPrintf(errlogMajor, "Error in addReccasterExcludePattern - strdup error for copying %s to new->item_str from addReccasterExcludePattern\n", argv[i]);
+            free(new);  /* frees if strdup fails */
+            break;
+        }
+        ellAdd(&self->exclude_patterns, &new->node);
     }
     epicsMutexUnlock(self->lock);
 }

client/castApp/src/testAddExcludePattern.c

@@ -20,7 +20,7 @@ static void testAddExcludePatternX(void)
     caster.onmsg = &testLog;
 
     int argc;
-    char *argvlist[6];
+    char *argvlist[5];
     argvlist[0] = "addReccasterExcludePattern";
 
     char *expectedPatterns[] =