commandline: fix strlcpy usage

diff --git a/src/suricata.c b/src/suricata.c
index 28e764f6668e081ab003c482f3c5449eadf9d2c0..7db868e42be136254cb4b6952774e875e6892645 100644 (file)
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -1116,9 +1116,7 @@ static int ParseCommandLineAfpacket(SCInstance *suri, const char *optarg)
         if (optarg) {
             LiveRegisterDevice(optarg);
             memset(suri->pcap_dev, 0, sizeof(suri->pcap_dev));
-            strlcpy(suri->pcap_dev, optarg,
-                    ((strlen(optarg) < sizeof(suri->pcap_dev)) ?
-                     (strlen(optarg) + 1) : sizeof(suri->pcap_dev)));
+            strlcpy(suri->pcap_dev, optarg, sizeof(suri->pcap_dev));
         }
     } else if (suri->run_mode == RUNMODE_AFP_DEV) {
         SCLogWarning(SC_WARN_PCAP_MULTI_DEV_EXPERIMENTAL, "using "
@@ -1153,7 +1151,7 @@ static int ParseCommandLinePcapLive(SCInstance *suri, const char *optarg)
         if (strlen(optarg) > 9 && strncmp(optarg, "DeviceNPF", 9) == 0) {
             snprintf(suri->pcap_dev, sizeof(suri->pcap_dev), "\\Device\\NPF%s", optarg+9);
         } else {
-            strlcpy(suri->pcap_dev, optarg, ((strlen(optarg) < sizeof(suri->pcap_dev)) ? (strlen(optarg)+1) : (sizeof(suri->pcap_dev))));
+            strlcpy(suri->pcap_dev, optarg, sizeof(suri->pcap_dev));
             PcapTranslateIPToDevice(suri->pcap_dev, sizeof(suri->pcap_dev));
         }