From: Victor Julien <victor@inliniac.net>
Date: Fri, 28 Feb 2020 09:38:22 +0000 (+0100)
Subject: pcap/file: fix function ptr naming
X-Git-Tag: suricata-6.0.0-beta1~693
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=227e2812f6c96fc08d2659aa36853542ec403473;p=thirdparty%2Fsuricata.git

pcap/file: fix function ptr naming
---

diff --git a/src/source-pcap-file-helper.c b/src/source-pcap-file-helper.c
index 798cc4ee8e..22b9c747a0 100644
--- a/src/source-pcap-file-helper.c
+++ b/src/source-pcap-file-helper.c
@@ -201,34 +201,32 @@ TmEcode InitPcapFile(PcapFileFileVars *pfv)
     SCReturnInt(validated);
 }
 
-TmEcode ValidateLinkType(int datalink, DecoderFunc *decoder)
+TmEcode ValidateLinkType(int datalink, DecoderFunc *DecoderFn)
 {
     switch (datalink) {
         case LINKTYPE_LINUX_SLL:
-            *decoder = DecodeSll;
+            *DecoderFn = DecodeSll;
             break;
         case LINKTYPE_ETHERNET:
-            *decoder = DecodeEthernet;
+            *DecoderFn = DecodeEthernet;
             break;
         case LINKTYPE_PPP:
-            *decoder = DecodePPP;
+            *DecoderFn = DecodePPP;
             break;
         case LINKTYPE_IPV4:
         case LINKTYPE_RAW:
         case LINKTYPE_RAW2:
         case LINKTYPE_GRE_OVER_IP:
-            *decoder = DecodeRaw;
+            *DecoderFn = DecodeRaw;
             break;
         case LINKTYPE_NULL:
-            *decoder = DecodeNull;
+            *DecoderFn = DecodeNull;
             break;
 
         default:
-            SCLogError(
-                    SC_ERR_UNIMPLEMENTED,
-                    "datalink type %" PRId32 " not (yet) supported in module PcapFile.",
-                    datalink
-            );
+            SCLogError(SC_ERR_UNIMPLEMENTED,
+                    "datalink type %"PRId32" not (yet) supported in module PcapFile.",
+                    datalink);
             SCReturnInt(TM_ECODE_FAILED);
     }