From: Francois-Xavier Le Bail <fx.lebail@yahoo.com>
Date: Sat, 5 Sep 2015 16:24:40 +0000 (+0200)
Subject: Fix warnings as "C++ style comments are not allowed in ISO C90"
X-Git-Tag: libpcap-1.8.0-bp~234
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/997da290ed8373b8338d1e01399149347bcb0adf

Fix warnings as "C++ style comments are not allowed in ISO C90"
---

diff --git a/pcap-canusb-linux.c b/pcap-canusb-linux.c
index dc57c99b..4c51d63d 100644
--- a/pcap-canusb-linux.c
+++ b/pcap-canusb-linux.c
@@ -108,16 +108,16 @@ int canusb_findalldevs(pcap_if_t **alldevsp, char *err_str)
     for(i=0;i<cnt;i++)
     {
         int ret;
-        // Check if this device is interesting.
+        /* Check if this device is interesting. */
         struct libusb_device_descriptor desc;
         libusb_device_handle *dh;
 
         libusb_get_device_descriptor(devs[i],&desc);
 
         if ((desc.idVendor != CANUSB_VID) || (desc.idProduct != CANUSB_PID))
-            continue; //It is not, check next device
+            continue; /* It is not, check next device */
 
-        //It is!
+        /* It is! */
         dh = NULL;
 
         if ((ret = libusb_open(devs[i],&dh)) == 0)
@@ -156,7 +156,7 @@ static libusb_device_handle* canusb_opendevice(struct libusb_context *ctx, char*
 
     for(i=0;i<cnt;i++)
     {
-        // Check if this device is interesting.
+        /* Check if this device is interesting. */
         struct libusb_device_descriptor desc;
         libusb_device_handle *dh;
 
@@ -165,7 +165,7 @@ static libusb_device_handle* canusb_opendevice(struct libusb_context *ctx, char*
         if ((desc.idVendor != CANUSB_VID) || (desc.idProduct != CANUSB_PID))
           continue;
 
-        //Found one!
+        /* Found one! */
         dh = NULL;
 
         if (libusb_open(devs[i],&dh) != 0) continue;
@@ -197,7 +197,7 @@ static libusb_device_handle* canusb_opendevice(struct libusb_context *ctx, char*
             continue;
         }
 
-        //Fount it!
+        /* Fount it! */
         libusb_free_device_list(devs,1);
         return dh;
     }
@@ -276,7 +276,7 @@ static void* canusb_capture_thread(void *arg)
         struct CAN_Msg msg;
 
         libusb_interrupt_transfer(canusb->dev, 0x81, (unsigned char*)&status, sizeof(status), &sz, 100);
-        //HACK!!!!! -> drop buffered data, read new one by reading twice.
+        /* HACK!!!!! -> drop buffered data, read new one by reading twice. */
         libusb_interrupt_transfer(canusb->dev, 0x81, (unsigned char*)&status, sizeof(status), &sz, 100);
 
         for(i = 0; i<status.rxsz; i++)
@@ -312,9 +312,9 @@ static void canusb_clearbufs(struct pcap_canusb* this)
     unsigned char cmd[16];
     int al;
 
-    cmd[0] = 1;  //Empty incoming buffer
-    cmd[1] = 1;  //Empty outgoing buffer
-    cmd[3] = 0;  //Not a write to serial number
+    cmd[0] = 1;  /* Empty incoming buffer */
+    cmd[1] = 1;  /* Empty outgoing buffer */
+    cmd[3] = 0;  /* Not a write to serial number */
     memset(&cmd[4],0,16-4);
 
     libusb_interrupt_transfer(this->dev, 0x1,cmd,16,&al,100);
diff --git a/pcap-dbus.c b/pcap-dbus.c
index ab3f1258..09672f24 100644
--- a/pcap-dbus.c
+++ b/pcap-dbus.c
@@ -66,7 +66,7 @@ dbus_read(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user)
 	message = dbus_connection_pop_message(handlep->conn);
 
 	while (!message) {
-		// XXX handle->opt.timeout = timeout_ms;
+		/* XXX handle->opt.timeout = timeout_ms; */
 		if (!dbus_connection_read_write(handlep->conn, 100)) {
 			snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Connection closed");
 			return -1;
diff --git a/pcap-linux.c b/pcap-linux.c
index 572eafbd..13d79ff0 100644
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -3195,7 +3195,7 @@ static void map_arphrd_to_dlt(pcap_t *handle, int sock_fd, int arptype,
 		 * so let's use "Linux-cooked" mode. Jean II
 		 *
 		 * XXX - this is handled in activate_new(). */
-		//handlep->cooked = 1;
+		/* handlep->cooked = 1; */
 		break;
 
 	/* ARPHRD_LAPD is unofficial and randomly allocated, if reallocation
@@ -3238,7 +3238,7 @@ static void map_arphrd_to_dlt(pcap_t *handle, int sock_fd, int arptype,
 		 *
 		 * XXX - this is handled in activate_new().
 		 */
-		//handlep->cooked = 1;
+		/* handlep->cooked = 1; */
 		break;
 
 	default:
diff --git a/pcap/pcap.h b/pcap/pcap.h
index 0008cb0b..ed0f2412 100644
--- a/pcap/pcap.h
+++ b/pcap/pcap.h
@@ -451,9 +451,10 @@ void	bpf_dump(const struct bpf_program *, int);
 */
 struct pcap_send_queue
 {
-	u_int maxlen;	///< Maximum size of the the queue, in bytes. This variable contains the size of the buffer field.
-	u_int len;	///< Current size of the queue, in bytes.
-	char *buffer;	///< Buffer containing the packets to be sent.
+	u_int maxlen;	/* Maximum size of the the queue, in bytes. This
+			   variable contains the size of the buffer field. */
+	u_int len;	/* Current size of the queue, in bytes. */
+	char *buffer;	/* Buffer containing the packets to be sent. */
 };
 
 typedef struct pcap_send_queue pcap_send_queue;