diff options
| author | Michał Orynicz <michal.orynicz@tieto.com> | 2014-11-20 09:55:40 +0100 |
|---|---|---|
| committer | Michal Labedzki <michal.labedzki@tieto.com> | 2014-11-20 11:06:46 +0000 |
| commit | 6fbcc18742d1be16bdd6e80a05b55eef97f91000 (patch) | |
| tree | 1a921da58a353ffe8aaf35c4c453a1b8c6e66bba | |
| parent | 087518b3268edb5477f67ea56c35ac39e2c7b560 (diff) | |
Fix text logcat for changes in android L
In L, in line "-- beginning of /<buffer>" the "/" was removed.
This commit accomodates text logcat to that change.
Change-Id: I4cbfadf5a8169589f2848ce1a5793cea593ba459
Reviewed-on: https://code.wireshark.org/review/5405
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
| -rw-r--r-- | epan/dissectors/packet-logcat-text.c | 2 | ||||
| -rw-r--r-- | wiretap/logcat_text.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-logcat-text.c b/epan/dissectors/packet-logcat-text.c index 1f043c2376..54eb4f4c51 100644 --- a/epan/dissectors/packet-logcat-text.c +++ b/epan/dissectors/packet-logcat-text.c @@ -31,7 +31,7 @@ #include <stdio.h> /* Basically the same regexes are present in wiretap/logcat_text.c */ -#define SPECIAL_STRING "[-]+ (beginning of \\/.+)" +#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+)\\): (.*)" diff --git a/wiretap/logcat_text.c b/wiretap/logcat_text.c index 9b797f38d9..9bbf2ff7b1 100644 --- a/wiretap/logcat_text.c +++ b/wiretap/logcat_text.c @@ -31,7 +31,7 @@ #include "logcat.h" /* Basically the same regexes are present in epan/packet-logcat-text.c */ -#define SPECIAL_STRING "[-]+ beginning of \\/" +#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*\\): .*" |