diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-17 18:17:19 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-17 18:17:19 +0000 |
| commit | a2041b6cda1acfc73fbcd0140d992717f78d794e (patch) | |
| tree | 74ab2260b064201ce2cf5c834d0ba0a847fd1d4b | |
| parent | 4601b23d7585c3f0ff815353e8cb38d50cad28d6 (diff) | |
| download | zabbix-a2041b6cda1acfc73fbcd0140d992717f78d794e.tar.gz zabbix-a2041b6cda1acfc73fbcd0140d992717f78d794e.tar.xz zabbix-a2041b6cda1acfc73fbcd0140d992717f78d794e.zip | |
Fixed zabbix_get.
git-svn-id: svn://svn.zabbix.com/trunk@2331 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | include/common.h | 1 | ||||
| -rw-r--r-- | src/libs/zbxcommon/str.c | 26 | ||||
| -rw-r--r-- | src/zabbix_get/Makefile.am | 1 | ||||
| -rw-r--r-- | src/zabbix_get/zabbix_get.c | 2 | ||||
| -rw-r--r-- | src/zabbix_server/expression.c | 31 |
5 files changed, 29 insertions, 32 deletions
diff --git a/include/common.h b/include/common.h index 8abbaa09..6ec2be5c 100644 --- a/include/common.h +++ b/include/common.h @@ -315,6 +315,7 @@ void free_result(AGENT_RESULT *result); char *string_replace(char *str, const char *sub_str1, const char *sub_str2); void del_zeroes(char *s); +void delete_reol(char *c); int get_param(const char *param, int num, char *buf, int maxlen); int num_param(const char *param); diff --git a/src/libs/zbxcommon/str.c b/src/libs/zbxcommon/str.c index efd5bbf3..b35b73a4 100644 --- a/src/libs/zbxcommon/str.c +++ b/src/libs/zbxcommon/str.c @@ -178,3 +178,29 @@ int num_param(const char *param) return ret; } +/****************************************************************************** + * * + * Function: delete_reol * + * * + * Purpose: delete all right EOL characters * + * * + * Parameters: c - string to delete EOL * + * * + * Return value: the string wtihout EOL * + * * + * Author: Alexei Vladishev * + * * + * Comments: * + * * + ******************************************************************************/ +void delete_reol(char *c) +{ + int i,j; + + j=0; + for(i=(int)strlen(c)-1;i>=0;i--) + { + if( c[i] != '\n') break; + c[i]=0; + } +} diff --git a/src/zabbix_get/Makefile.am b/src/zabbix_get/Makefile.am index 685cae28..b64c0978 100644 --- a/src/zabbix_get/Makefile.am +++ b/src/zabbix_get/Makefile.am @@ -1,3 +1,4 @@ SUBDIRS = bin_PROGRAMS = zabbix_get zabbix_get_SOURCES = zabbix_get.c +zabbix_get_LDADD = ../libs/zbxcommon/libzbxcommon.a diff --git a/src/zabbix_get/zabbix_get.c b/src/zabbix_get/zabbix_get.c index 71e6cbed..0f4146c1 100644 --- a/src/zabbix_get/zabbix_get.c +++ b/src/zabbix_get/zabbix_get.c @@ -183,7 +183,7 @@ static int get_value(char *server,int port,char *key,char *value) return FAIL; } - value[i-1]=0; + delete_reol(value); if( close(s)!=0 ) { diff --git a/src/zabbix_server/expression.c b/src/zabbix_server/expression.c index 65e6f478..bb39211e 100644 --- a/src/zabbix_server/expression.c +++ b/src/zabbix_server/expression.c @@ -231,37 +231,6 @@ int is_double(char *c) /****************************************************************************** * * - * Function: delete_reol * - * * - * Purpose: delete all right EOL characters * - * * - * Parameters: c - string to delete EOL * - * * - * Return value: the string wtihout EOL * - * * - * Author: Alexei Vladishev * - * * - * Comments: * - * * - ******************************************************************************/ -void delete_reol(char *c) -{ - int i,j; - - zabbix_log( LOG_LEVEL_DEBUG, "Before deleting EOL:%s", c ); - - j=0; - for(i=(int)strlen(c)-1;i>=0;i--) - { - if( c[i] != '\n') break; - c[i]=0; - } - - zabbix_log(LOG_LEVEL_DEBUG, "After deleting EOL:%s", c ); -} - -/****************************************************************************** - * * * Function: delete_spaces * * * * Purpose: delete all spaces * |