hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop

Browse Source
This commit is contained in:
Markus Makela
2014-10-01 14:38:15 +03:00
parent b0683d9b4d a53e80e144
commit 856448500e
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
log_manager/log_manager.cc
View File

@ -755,7 +755,12 @@ static int logmanager_write_log(
break; break;
} }
} }
wp[safe_str_len-1] = '\n'; /** remove double line feed */
if (wp[safe_str_len-2] == '\n')
{
wp[safe_str_len-2]=' ';
}
wp[safe_str_len-1] = '\n';
blockbuf_unregister(bb); blockbuf_unregister(bb);
/** /**

8
utils/skygw_utils.cc
View File

@ -119,14 +119,15 @@ static void slist_add_node(
slist_t* list, slist_t* list,
slist_node_t* node); slist_node_t* node);
#if defined(NOT_USED)
static slist_node_t* slist_node_get_next( static slist_node_t* slist_node_get_next(
slist_node_t* curr_node); slist_node_t* curr_node);
static slist_node_t* slist_get_first( static slist_node_t* slist_get_first(
slist_t* list); slist_t* list);
static slist_cursor_t* slist_get_cursor( static slist_cursor_t* slist_get_cursor(
slist_t* list); slist_t* list);
#endif /*< NOT_USED */
static bool file_write_header(skygw_file_t* file); static bool file_write_header(skygw_file_t* file);
static void simple_mutex_free_memory(simple_mutex_t* sm); static void simple_mutex_free_memory(simple_mutex_t* sm);
@ -740,7 +741,7 @@ static void slist_add_node(
} }
#if defined(NOT_USED)
static slist_node_t* slist_node_get_next( static slist_node_t* slist_node_get_next(
slist_node_t* curr_node) slist_node_t* curr_node)
{ {
@ -766,7 +767,6 @@ static slist_node_t* slist_get_first(
return NULL; return NULL;
} }
static slist_cursor_t* slist_get_cursor( static slist_cursor_t* slist_get_cursor(
slist_t* list) slist_t* list)
{ {
@ -777,7 +777,7 @@ static slist_cursor_t* slist_get_cursor(
c = slist_cursor_init(list); c = slist_cursor_init(list);
return c; return c;
} }
#endif /*< NOT_USED */
static slist_cursor_t* slist_cursor_init( static slist_cursor_t* slist_cursor_init(
slist_t* list) slist_t* list)