Wireshark-dev: Re: [Wireshark-dev] Problems building register.c with older glib g_async_queue_t

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Gisle Vanem <gisle.vanem@xxxxxxxxx>
Date: Thu, 23 Nov 2017 14:31:34 +0100
Anders Broman wrote:


Problems building register.c with older glib g_async_queue_timeout_pop().


I don't know about this problem.

But another problem is the "\r\n" newlines in a response-file
given to make-dissectors.exe. Should IMHO be:

--- a/epan/dissectors/make-dissectors.c 2017-11-23 12:01:27
+++ b/epan/dissectors/make-dissectors.c 2017-11-23 13:30:13
@@ -57,7 +57,7 @@

     if (!g_file_get_contents(list, &contents, NULL, NULL))
         return;
-    for (arg = strtok(contents, " \n"); arg != NULL; arg = strtok(NULL, " \n")) {
+    for (arg = strtok(contents, " \r\n"); arg != NULL; arg = strtok(NULL, " \r\n")) {
         scan_file(arg, protos, handoffs);
     }
     g_free(contents);

--
--gv