From: Victor Julien <victor@inliniac.net>
Date: Wed, 8 May 2019 14:50:04 +0000 (+0200)
Subject: detect/nfs.version: minor cleanups
X-Git-Tag: suricata-5.0.0-rc1~504
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b84eba80aa1bcd6edbfd76dd56b1095906732a9b;p=thirdparty%2Fsuricata.git

detect/nfs.version: minor cleanups
---

diff --git a/src/detect-nfs-version.c b/src/detect-nfs-version.c
index 986e69ab8d..e39b4cdba2 100644
--- a/src/detect-nfs-version.c
+++ b/src/detect-nfs-version.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Open Information Security Foundation
+/* Copyright (C) 2017-2019 Open Information Security Foundation
  *
  * You can copy, redistribute or modify this Program under the terms of
  * the GNU General Public License version 2 as published by the Free
@@ -94,13 +94,11 @@ void DetectNfsVersionRegister (void)
     sigmatch_table[DETECT_AL_NFS_VERSION].alias = "nfs_version";
     sigmatch_table[DETECT_AL_NFS_VERSION].desc = "match NFS version";
     sigmatch_table[DETECT_AL_NFS_VERSION].url = DOC_URL DOC_VERSION "/rules/nfs-keywords.html#version";
-    sigmatch_table[DETECT_AL_NFS_VERSION].Match = NULL;
     sigmatch_table[DETECT_AL_NFS_VERSION].AppLayerTxMatch = DetectNfsVersionMatch;
     sigmatch_table[DETECT_AL_NFS_VERSION].Setup = DetectNfsVersionSetup;
     sigmatch_table[DETECT_AL_NFS_VERSION].Free = DetectNfsVersionFree;
     sigmatch_table[DETECT_AL_NFS_VERSION].RegisterTests = DetectNfsVersionRegisterTests;
 
-
     DetectSetupParseRegexes(PARSE_REGEX, &parse_regex, &parse_regex_study);
 
     DetectAppLayerInspectEngineRegister("nfs_request",
@@ -327,23 +325,20 @@ error:
 static int DetectNfsVersionSetup (DetectEngineCtx *de_ctx, Signature *s,
                                    const char *rawstr)
 {
-    DetectNfsVersionData *dd = NULL;
-    SigMatch *sm = NULL;
-
     SCLogDebug("\'%s\'", rawstr);
 
     if (DetectSignatureSetAppProto(s, ALPROTO_NFS) != 0)
         return -1;
 
-    dd = DetectNfsVersionParse(rawstr);
+    DetectNfsVersionData *dd = DetectNfsVersionParse(rawstr);
     if (dd == NULL) {
         SCLogError(SC_ERR_INVALID_ARGUMENT,"Parsing \'%s\' failed", rawstr);
-        goto error;
+        return -1;
     }
 
     /* okay so far so good, lets get this into a SigMatch
      * and put it in the Signature. */
-    sm = SigMatchAlloc();
+    SigMatch *sm = SigMatchAlloc();
     if (sm == NULL)
         goto error;