Robot
/
lnav
mirror of https://github.com/tstack/lnav.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #760 from sureshsundriyal/master 

Minor changes to quell some compiler warnings and other miscellaneous changes.
This commit is contained in:
Tim Stack 2020-09-11 21:28:01 -07:00 committed by GitHub
parent 94e09c5228 9a49035ce6
commit c3f7eac29d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -13,7 +13,7 @@ Christopher Meng
Salvatore Bonaccorso
Henrietta Stack
Pablo Iranzo Gómez
androm3da (https://github.com/androm3da)
Brian Cain
Paul Wayper
Adam Spiers
Kevin Pham

5
src/base/lnav_log.cc
View File

@ -323,8 +323,11 @@ void log_msg_extra_complete()
static void sigabrt(int sig)
{
char crash_path[1024], latest_crash_path[1024];
int fd, frame_count;
int fd;
#ifdef HAVE_EXECINFO_H
int frame_count;
void *frames[128];
#endif
struct tm localtm;
time_t curr_time;

2
src/formats/vmw_log.json
View File

@ -26,7 +26,7 @@
"pattern": "^(?<timestamp>\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(?:\\.\\d{3})?(?:Z|[-+]\\d{2}:\\d{2})) (?<prc>[^:]+):\\s+(?<tid>\\w+):\\s+(?<comp>[^:]+):(?<line>\\d+)?\\s+(?<level>\\w+):?\\s+(?<body>.*)(?:\\n(?:.|\\n)*)?$"
},
"vum-log4cpp": {
"pattern": "^\\[(?<timestamp>\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}:\\d{3}) '(?<category>[^']*)' (?<tid>\\d+) (?<level>EMERG|FATAL|ALERT|CRIT|ERROR|WARN|NOTICE|INFO|DEBUG|NOTSET)\\]\\s+(\\[(?<file>\\S+), (?<line>\\d+)\\])? (?<body>.*$)"
"pattern": "^\\[(?<timestamp>\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}:\\d{3}) '(?<category>[^']*)' (?<tid>\\d+) (?<level>[a-zA-Z]+)\\]\\s+(?>\\[(?<file>\\S+), (?<line>\\d+)\\])? (?<body>.*$)"
}
},
"level-field": "level",

2
src/lnav_config.hh
View File

@ -32,8 +32,6 @@
#ifndef _lnav_config_hh
#define _lnav_config_hh
#include <sys/queue.h>
#include <map>
#include <string>
#include <vector>