rule/parse: minor action parsing cleanup

diff --git a/src/detect-parse.c b/src/detect-parse.c
index c3ef0937578cce261f817670e211d6af443b24b4..1fe4eefb9a92298de05ac2d6130373b7056db320 100644 (file)
--- a/src/detect-parse.c
+++ b/src/detect-parse.c
@@ -992,37 +992,29 @@ static int SigParseAction(Signature *s, const char *action)
 {
     if (strcasecmp(action, "alert") == 0) {
         s->action = ACTION_ALERT;
-        return 0;
     } else if (strcasecmp(action, "drop") == 0) {
         s->action = ACTION_DROP;
-        return 0;
     } else if (strcasecmp(action, "pass") == 0) {
         s->action = ACTION_PASS;
-        return 0;
-    } else if (strcasecmp(action, "reject") == 0) {
-        if (!(SigParseActionRejectValidate(action)))
-            return -1;
-        s->action = ACTION_REJECT|ACTION_DROP;
-        return 0;
-    } else if (strcasecmp(action, "rejectsrc") == 0) {
+    } else if (strcasecmp(action, "reject") == 0 ||
+               strcasecmp(action, "rejectsrc") == 0)
+    {
         if (!(SigParseActionRejectValidate(action)))
             return -1;
         s->action = ACTION_REJECT|ACTION_DROP;
-        return 0;
     } else if (strcasecmp(action, "rejectdst") == 0) {
         if (!(SigParseActionRejectValidate(action)))
             return -1;
         s->action = ACTION_REJECT_DST|ACTION_DROP;
-        return 0;
     } else if (strcasecmp(action, "rejectboth") == 0) {
         if (!(SigParseActionRejectValidate(action)))
             return -1;
         s->action = ACTION_REJECT_BOTH|ACTION_DROP;
-        return 0;
     } else {
         SCLogError(SC_ERR_INVALID_ACTION,"An invalid action \"%s\" was given",action);
         return -1;
     }
+    return 0;
 }
 
 /**