Fix for very big pid and tid numbers in logcat_text
authorMichał Orynicz <michal.orynicz@tieto.com>
Thu, 20 Nov 2014 12:16:33 +0000 (13:16 +0100)
committerMichal Labedzki <michal.labedzki@tieto.com>
Fri, 21 Nov 2014 07:50:40 +0000 (07:50 +0000)
There can be no space after pid colon if tid is big enough
in logcat long format.

Change-Id: I8e03e78c88e4bef1a5fdb3a04b77f58fa7d055bc
Reviewed-on: https://code.wireshark.org/review/5411
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
wiretap/logcat_text.h

index 9d5cbb0410d8ca4b8869d1274e5b34a89cc3aa6a..339b306ad7f1b6200fc7f4f51367750909933278 100644 (file)
@@ -32,7 +32,7 @@
 #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])/(.+) ]\\R(.*)"
+#define LONG_STRING "\\[ (\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{3}) +(\\d+): *(\\d+) ([IVDWEF])/(.+) ]\\R(.*)"
 
 wtap_open_return_val logcat_text_open(wtap *wth, int *err, gchar **err_info);