diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-07 12:31:27 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-07 12:31:27 +0000 |
| commit | 0ed4ab2d1bf959703c6cf897b127b6ffb38dc0db (patch) | |
| tree | 28568d24dc50bb0baa9957b895deb72e183997b9 /src | |
| parent | bacd714155a4829cb720c73474cfbf655fb5fe94 (diff) | |
| download | zabbix-0ed4ab2d1bf959703c6cf897b127b6ffb38dc0db.tar.gz zabbix-0ed4ab2d1bf959703c6cf897b127b6ffb38dc0db.tar.xz zabbix-0ed4ab2d1bf959703c6cf897b127b6ffb38dc0db.zip | |
MInor changes.
git-svn-id: svn://svn.zabbix.com/trunk@2286 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/zbxsysinfo/common/common.c | 4 | ||||
| -rw-r--r-- | src/zabbix_agent/active.c | 4 | ||||
| -rw-r--r-- | src/zabbix_agent/zabbix_agent.c | 2 | ||||
| -rw-r--r-- | src/zabbix_agent/zabbix_agentd.c | 2 | ||||
| -rw-r--r-- | src/zabbix_server/poller/checks_simple.c | 2 |
5 files changed, 13 insertions, 1 deletions
diff --git a/src/libs/zbxsysinfo/common/common.c b/src/libs/zbxsysinfo/common/common.c index 3dae72da..fd54a2ec 100644 --- a/src/libs/zbxsysinfo/common/common.c +++ b/src/libs/zbxsysinfo/common/common.c @@ -289,6 +289,10 @@ void test_parameters(void) { printf(" [d|%lf]", result.dbl); } + if(result.type & AR_UINT64) + { + printf(" [u|" ZBX_FS_UI64 "]", result.ui64); + } if(result.type & AR_STRING) { printf(" [s|%s]", result.str); diff --git a/src/zabbix_agent/active.c b/src/zabbix_agent/active.c index be14182c..0998892c 100644 --- a/src/zabbix_agent/active.c +++ b/src/zabbix_agent/active.c @@ -474,7 +474,9 @@ int process_active_checks(char *server, int port) process(metrics[i].key, 0, &result); if(result.type & AR_DOUBLE) - snprintf(value, MAX_STRING_LEN-1, "%f", result.dbl); + snprintf(value, MAX_STRING_LEN-1, "%lf", result.dbl); + else if(result.type & AR_UINT64) + snprintf(value, MAX_STRING_LEN-1, ZBX_FS_UI64, result.ui64); else if(result.type & AR_STRING) snprintf(value, MAX_STRING_LEN-1, "%s", result.str); else if(result.type & AR_MESSAGE) diff --git a/src/zabbix_agent/zabbix_agent.c b/src/zabbix_agent/zabbix_agent.c index 1698e9d5..c2cdddce 100644 --- a/src/zabbix_agent/zabbix_agent.c +++ b/src/zabbix_agent/zabbix_agent.c @@ -111,6 +111,8 @@ int main() process(s, 0, &result); if(result.type & AR_DOUBLE) snprintf(value, MAX_STRING_LEN-1, "%f", result.dbl); + else if(result.type & AR_UINT64) + snprintf(value, MAX_STRING_LEN-1, ZBX_FS_UI64, result.ui64); else if(result.type & AR_STRING) snprintf(value, MAX_STRING_LEN-1, "%s", result.str); else if(result.type & AR_MESSAGE) diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c index 1c1debee..b9c39be1 100644 --- a/src/zabbix_agent/zabbix_agentd.c +++ b/src/zabbix_agent/zabbix_agentd.c @@ -344,6 +344,8 @@ void process_child(int sockfd) process(line, 0, &result); if(result.type & AR_DOUBLE) snprintf(value, MAX_STRING_LEN-1, "%f", result.dbl); + else if(result.type & AR_UINT64) + snprintf(value, MAX_STRING_LEN-1, ZBX_FS_UI64, result.ui64); else if(result.type & AR_STRING) snprintf(value, MAX_STRING_LEN-1, "%s", result.str); else if(result.type & AR_MESSAGE) diff --git a/src/zabbix_server/poller/checks_simple.c b/src/zabbix_server/poller/checks_simple.c index d2e7c5ae..f54d0564 100644 --- a/src/zabbix_server/poller/checks_simple.c +++ b/src/zabbix_server/poller/checks_simple.c @@ -106,6 +106,8 @@ int get_value_simple(double *result_dbl, char *result_str,DB_ITEM *item, char *e process(c, 0, &result); if(result.type & AR_DOUBLE) snprintf(result_str, MAX_STRING_LEN-1, "%lf", result.dbl); + else if(result.type & AR_UINT64) + snprintf(result_str, MAX_STRING_LEN-1, ZBX_FS_UI64, result.ui64); else if(result.type & AR_STRING) snprintf(result_str, MAX_STRING_LEN-1, "%s", result.str); else if(result.type & AR_MESSAGE) |