Commit Graph

13 Commits

Author SHA1 Message Date
Dario Lombardo 8cd389e161 replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.
The first is deprecated, as per https://spdx.org/licenses/.

Change-Id: I8e21e1d32d09b8b94b93a2dc9fbdde5ffeba6bed
Reviewed-on: https://code.wireshark.org/review/25661
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-08 14:57:36 +00:00
Gerald Combs 6b22e4e85a Add an exit code to make-dissectors.
Explicitly return 0 from make-dissectors on success. Hopefully this will
fix some Windows builder failures.

Change-Id: I0c172597584c52ced2380719135e8559ef83392a
Reviewed-on: https://code.wireshark.org/review/25150
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-05 00:30:59 +00:00
João Valverde c79fb9d028 make-dissectors: Indent and cleanup #include
Change-Id: I395d0c168a6ba2fc8fad85598e6355493b897a7a
Reviewed-on: https://code.wireshark.org/review/24748
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-09 23:51:15 +00:00
João Valverde 72c2256633 make-dissectors: Fix null pointer dereference for error condition
Found by scan-build.

Change-Id: I89b56bac951ccb7054d494592928306a860f9e5e
Reviewed-on: https://code.wireshark.org/review/24697
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-04 09:11:08 +00:00
João Valverde 952dc3ae32 make-dissectors: Use g_file_set_contents()
Also add some more errors checks, we only pass valid files to make-dissectors.

Change-Id: I9c068e47f35ee6c3da0112ee9ce905af35030475
Reviewed-on: https://code.wireshark.org/review/24625
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29 06:11:56 +00:00
João Valverde 0780975703 make-dissectors: Another attempt to use newlines instead of spaces
Change-Id: I7ff5a0ea3eb3f7f56debc54aee6d5147815acc1b
Reviewed-on: https://code.wireshark.org/review/24552
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-23 16:59:52 +00:00
João Valverde 3a80970f12 make-dissectors: Fallback to the newly introduced glib-compat replacement
Change-Id: Ieb7ea23d8109a60dce7dd0c848438e93d671a3c9
Reviewed-on: https://code.wireshark.org/review/24546
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-23 16:19:44 +00:00
João Valverde b6f5ee68f6 make-dissectors: Don't use stdout
This will prevent the file from being created with shell redirection
in case of error and allow printing informational messages to stdout
instead of stderr.

Also improve dissectorc.c Makefile recipe to abort on errors.

Change-Id: I64722927721887b57a7dbe69fd2625c2e4648ad4
Reviewed-on: https://code.wireshark.org/review/24545
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-23 12:09:55 +00:00
AndersBroman fe76be0b5b [make-dissectors] g_ptr_array_new_full() is glib 2.30.0 which we do not
require.

Add alternate code to fix the build for our minimum required version.

Change-Id: Ia0911c5a6be3af68330ac41a3336d7d47b87b7a9
Reviewed-on: https://code.wireshark.org/review/24535
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-23 06:14:38 +00:00
João Valverde 2add5e701f make-dissectors: Print the number of functions successfully parsed
Change-Id: I7364571ddc9b86efd41dcade97f843037e09f0ac
Reviewed-on: https://code.wireshark.org/review/24541
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-23 01:18:02 +00:00
João Valverde 4fbb2df3cd Revert "make-dissectors: Be more resilient with whitespace"
This reverts commit ed9d085520.

It's causing a segfault on our Windows buildbots.

Change-Id: I3cdd31955bdec7be3ad91cff4af8dc3efdc9e8b7
Reviewed-on: https://code.wireshark.org/review/24510
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-20 14:48:05 +00:00
João Valverde ed9d085520 make-dissectors: Be more resilient with whitespace
Preemptively try to be more resilient for files with spaces in them
(for Windows).

Use newlines to separate file list. Clean up duplicate PIDL file entries.

Change-Id: Ib506cca785836e05e4665e911de0d45ab4da1165
Reviewed-on: https://code.wireshark.org/review/24507
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-20 12:44:49 +00:00
João Valverde fe0c2b0485 Rewrite make-dissector-reg.py in C
The output compares equal to make-dissector-reg.py and the regex
should be more robust (multiline, complete start of function definition).

The primary motivation is to clean up the python script. This small
binary results in much cleaner code. The python script is used only
to generate plugin code, therefore it is renamed.

Also in my casual measurements the C code is much faster (without cache)
than the python script with the cache.

Change-Id: Id4e8cac3c836d56775aba4819357a95ef19bcb85
Reviewed-on: https://code.wireshark.org/review/24497
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-20 06:03:08 +00:00