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

Fixed log manager sometimes not writing the last character in a log message.

Browse Source 
This was caused by type conversions from int to size_t and the usage of the MAX macro.
This commit is contained in:
Markus Makela
2015-02-20 04:42:02 +02:00
parent 093489d0d7
commit 3924f70d6b
6 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/skygw_utils.cc
View File

@ -31,7 +31,7 @@
const char* timestamp_formatstr = "%04d-%02d-%02d %02d:%02d:%02d ";
/** One for terminating '\0' */
const int timestamp_len = 4+1 +2+1 +2+1 +2+1 +2+1 +2+3 +1;
const size_t timestamp_len = (4+1 +2+1 +2+1 +2+1 +2+1 +2+3 +1) * sizeof(char);
/** Single-linked list for storing test cases */
@ -662,7 +662,7 @@ bool mlist_cursor_move_to_first(
/** End of mlist */
int get_timestamp_len(void)
size_t get_timestamp_len(void)
{
return timestamp_len;
}
@ -682,13 +682,13 @@ int get_timestamp_len(void)
* @details (write detailed description here)
*
*/
int snprint_timestamp(
size_t snprint_timestamp(
char* p_ts,
int tslen)
size_t tslen)
{
time_t t;
struct tm tm;
int rval;
size_t rval;
if (p_ts == NULL) {
rval = 0;
@ -708,7 +708,7 @@ int snprint_timestamp(
tm.tm_min,
tm.tm_sec);
rval = strlen(p_ts);
rval = strlen(p_ts)*sizeof(char);
retblock:
return rval;
}

4
utils/skygw_utils.h
View File

@ -124,8 +124,8 @@ int skygw_thread_start(skygw_thread_t* thr);
skygw_thr_state_t skygw_thread_get_state(skygw_thread_t* thr);
pthread_t skygw_thread_gettid(skygw_thread_t* thr);
int get_timestamp_len(void);
int snprint_timestamp(char* p_ts, int tslen);
size_t get_timestamp_len(void);
size_t snprint_timestamp(char* p_ts, size_t tslen);
EXTERN_C_BLOCK_BEGIN