Remove remaining no-op strrchr() calls.

Apparently, its intended purpose indeed is to skip an optional "/dev/"
before the capture device name, but only in open_dlpi_device(), which
seems to handle the return value correctly.  The instances in other
modules are no-op side effects of commit 2426611.  Eliminate the local
variable as well where it makes sense.

Author: infrastation

pcap-bt-linux.c

@@ -154,9 +154,7 @@ bt_create(const char *device, char *ebuf, int *is_ours)
 	pcap_t *p;
 
 	/* Does this look like a Bluetooth device? */
-	cp = strrchr(device, '/');
-	if (cp == NULL)
-		cp = device;
+	cp = device;
 	/* Does it begin with BT_IFACE? */
 	if (strncmp(cp, BT_IFACE, sizeof BT_IFACE - 1) != 0) {
 		/* Nope, doesn't begin with BT_IFACE */

pcap-bt-monitor-linux.c

@@ -258,13 +258,8 @@ pcap_t *
 bt_monitor_create(const char *device, char *ebuf, int *is_ours)
 {
     pcap_t      *p;
-    const char  *cp;
 
-    cp = strrchr(device, '/');
-    if (cp == NULL)
-        cp = device;
-
-    if (strcmp(cp, INTERFACE_NAME) != 0) {
+    if (strcmp(device, INTERFACE_NAME) != 0) {
         *is_ours = 0;
         return NULL;
     }

pcap-netfilter-linux.c

@@ -729,9 +729,7 @@ netfilter_create(const char *device, char *ebuf, int *is_ours)
 	pcap_t *p;
 
 	/* Does this look like an netfilter device? */
-	cp = strrchr(device, '/');
-	if (cp == NULL)
-		cp = device;
+	cp = device;
 
 	/* Does it begin with NFLOG_IFACE or NFQUEUE_IFACE? */
 	if (strncmp(cp, NFLOG_IFACE, sizeof NFLOG_IFACE - 1) == 0)

pcap-septel.c

@@ -215,14 +215,10 @@ static pcap_t *septel_activate(pcap_t* handle) {
 }
 
 pcap_t *septel_create(const char *device, char *ebuf, int *is_ours) {
-	const char *cp;
 	pcap_t *p;
 
 	/* Does this look like the Septel device? */
-	cp = strrchr(device, '/');
-	if (cp == NULL)
-		cp = device;
-	if (strcmp(cp, "septel") != 0) {
+	if (strcmp(device, "septel") != 0) {
 		/* Nope, it's not "septel" */
 		*is_ours = 0;
 		return NULL;

pcap-usb-linux.c

@@ -419,9 +419,7 @@ usb_create(const char *device, char *ebuf, int *is_ours)
 	pcap_t *p;
 
 	/* Does this look like a USB monitoring device? */
-	cp = strrchr(device, '/');
-	if (cp == NULL)
-		cp = device;
+	cp = device;
 	/* Does it begin with USB_IFACE? */
 	if (strncmp(cp, USB_IFACE, sizeof USB_IFACE - 1) != 0) {
 		/* Nope, doesn't begin with USB_IFACE */