Wireshark-dev: Re: [Wireshark-dev] Problems building register.c with older glib g_async_queue_t
From: João Valverde <joao.valverde@xxxxxxxxxxxxxxxxxx>
Date: Thu, 23 Nov 2017 21:43:40 +0000


On 23-11-2017 13:31, Gisle Vanem wrote:
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);


The newline was only being used on Unixes as the last character in a space-separated string (so that wasn't an issue) but now the token has been changed to newlines on all platforms and your reminder was helpful. Thanks.