diff options
author | Aleksejs Sestakovs <aleksejs.sestakovs@zabbix.com> | 2020-01-28 21:10:56 +0300 |
---|---|---|
committer | Aleksejs Sestakovs <aleksejs.sestakovs@zabbix.com> | 2020-01-28 21:10:56 +0300 |
commit | 4ba903d31dcc9293b2e6737c08349d0680db7056 (patch) | |
tree | 9f54da155173a62b01a917465a92d41f2c911590 | |
parent | 927a976cfd58ab30010cb405ca8844d36af5325f (diff) |
........S. [ZBXNEXT-1736] changed ZBX_FS_DBL macro to support double precision values
-rw-r--r-- | include/zbxtypes.h | 5 | ||||
-rw-r--r-- | src/libs/zbxdbhigh/db.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/zbxtypes.h b/include/zbxtypes.h index cc014f90407..73129c3ab89 100644 --- a/include/zbxtypes.h +++ b/include/zbxtypes.h @@ -159,8 +159,9 @@ typedef off_t zbx_offset_t; #endif /* _WINDOWS */ -#define ZBX_FS_DBL "%lf" -#define ZBX_FS_DBL_EXT(p) "%." #p "lf" +#define ZBX_FS_ARG_LIST(m, a) m(a) +#define ZBX_FS_DBL_EXT(p) "%." #p "g" +#define ZBX_FS_DBL ZBX_FS_ARG_LIST(ZBX_FS_DBL_EXT, DECIMAL_DIG) #define ZBX_PTR_SIZE sizeof(void *) #define ZBX_FS_SIZE_T ZBX_FS_UI64 diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c index 4dd5e699bf0..eec13ca6bd4 100644 --- a/src/libs/zbxdbhigh/db.c +++ b/src/libs/zbxdbhigh/db.c @@ -2604,7 +2604,7 @@ retry_oracle: zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%d", value->i32); break; case ZBX_TYPE_FLOAT: - zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%.*g", DECIMAL_DIG, value->dbl); + zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, ZBX_FS_DBL, value->dbl); break; case ZBX_TYPE_UINT: zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, ZBX_FS_UI64, |