Merge commit 'develop' into feature-127-protocol-split

* remove a lot of white spaces
* many conflicts in enb_config.c
This commit is contained in:
Robert Schmidt
2018-11-07 16:07:59 +01:00
246 changed files with 16448 additions and 9003 deletions
+1 -1
View File
@@ -456,7 +456,7 @@ int rt = pthread_getname_np(pthread_self(), threadname,bufsize) ;
}
}
int inline log_header(char *log_buffer, int buffsize, int comp, int level,const char *format) {
static int log_header(char *log_buffer, int buffsize, int comp, int level,const char *format) {
char threadname[PR_SET_NAME];
return snprintf(log_buffer, buffsize , "%s%s[%s]%c %s %s%s",
log_level_highlight_end[level],