From 1d8673c0dfe7e723c83e04ba0cf449b2a8a08ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Orynicz?= Date: Thu, 20 Nov 2014 13:09:31 +0100 Subject: Move text logcat regex strings to shared header To avoid further duplication of work and bugfixing, move regex strings to wiretap/logcat_text.h and include this file in epan/dissectors/packet-logcat-text.c Change-Id: I82773cda0e3240844139b104c68738ec82788014 Reviewed-on: https://code.wireshark.org/review/5410 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki --- wiretap/logcat_text.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'wiretap/logcat_text.c') diff --git a/wiretap/logcat_text.c b/wiretap/logcat_text.c index 9bbf2ff7b1..674991d53a 100644 --- a/wiretap/logcat_text.c +++ b/wiretap/logcat_text.c @@ -30,16 +30,6 @@ #include "logcat_text.h" #include "logcat.h" -/* Basically the same regexes are present in epan/packet-logcat-text.c */ -#define SPECIAL_STRING "[-]+ beginning of \\/?" -#define BRIEF_STRING "[IVDWEF]/.*\\( *\\d*\\): .*" -#define TAG_STRING "[IVDWEF]/.*: .*" -#define TIME_STRING "\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{3} [IVDWEF]/.*\\( *\\d*\\): .*" -#define THREAD_STRING "[IVDWEF]\\( *\\d+: *\\d+\\) .*" -#define PROCESS_STRING "[IVDWEF]\\( *\\d+\\) .*" -#define THREADTIME_STRING "\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{3} *\\d+ *\\d+ [IVDWEF] .+: +" -#define LONG_STRING "\\[ (\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{3}) +(\\d+): +(\\d+) ([IVDWEF])/(.+) ]" - struct dumper_t { int type; }; -- cgit v1.2.1