osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
João Valverde 2017-11-20 11:31:18 +00:00 committed by João Valverde
parent 121654beb2
commit 0780975703
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/CMakeLists.txt
View File

@ -1869,7 +1869,7 @@ target_link_libraries(make-dissectors ${GLIB2_LIBRARIES})
#
file(GENERATE
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/dissectors.c.in"
CONTENT "$<JOIN:${ALL_DISSECTOR_SRC}, >"
CONTENT "$<JOIN:${ALL_DISSECTOR_SRC},\n>\n"
)
add_custom_command(
OUTPUT dissectors.c

2
epan/dissectors/Makefile.am
View File

@ -1942,7 +1942,7 @@ x11-dissector: $(top_srcdir)/tools/process-x11-fields.pl $(srcdir)/x11-fields $(
#
dissectors.c: make-dissectors $(ALL_DISSECTORS_SRC)
@echo Making dissectors.c
@echo $(filter %.c,$^) > $@.in && \
@echo $(filter %.c,$^) | tr ' ' '\n' > $@.in && \
$(builddir)/make-dissectors $@ @$@.in
MOSTLYCLEANFILES = \

8
epan/dissectors/make-dissectors.c
View File

@ -17,6 +17,12 @@
#define ARRAY_RESERVED_SIZE 2048
#ifdef _WIN32
#define SEP "\r\n"
#else
#define SEP "\n"
#endif
GRegex *protos_regex, *handoffs_regex;
static int
@ -59,7 +65,7 @@ scan_list(const char *list, GPtrArray *protos, GPtrArray *handoffs)
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, SEP); arg != NULL; arg = strtok(NULL, SEP)) {
scan_file(arg, protos, handoffs);
}
g_free(contents);