summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-04-09 12:58:11 +0000
committersasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-04-09 12:58:11 +0000
commitd53a7572a565383d4680361388063acb0a864aaa (patch)
tree6f8d335d41143ca3f0e77cd0ddeb074566279270
parent967bde43d4c97821fbeb56f555f419d8a566de73 (diff)
downloadzabbix-d53a7572a565383d4680361388063acb0a864aaa.tar.gz
zabbix-d53a7572a565383d4680361388063acb0a864aaa.tar.xz
zabbix-d53a7572a565383d4680361388063acb0a864aaa.zip
- [ZBX-351] added support of floating point values w/o zero (.12) (Sasha)
[merged from branches/1.4 5600:5602] git-svn-id: svn://svn.zabbix.com/trunk@5603 97f52cf1-0a1b-0410-bd0e-c28be96e8082
-rw-r--r--ChangeLog1
-rw-r--r--src/libs/zbxcommon/misc.c6
2 files changed, 2 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 0fb95792..1da3e753 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,6 +71,7 @@ Changes for 1.5:
Changes for 1.4.6:
+ - [ZBX-351] added support of floating point values w/o zero (.12) (Sasha)
- [ZBX-350] fixed processing in_condition under Oracle (Sasha)
- [ZBX-348] fixed incorrect processing of large integer values for {ITEM.LASTVALUE} (Alexei)
- [ZBX-337] added Oracle upgrade scripts (Sasha)
diff --git a/src/libs/zbxcommon/misc.c b/src/libs/zbxcommon/misc.c
index 490cffb6..3c91dd30 100644
--- a/src/libs/zbxcommon/misc.c
+++ b/src/libs/zbxcommon/misc.c
@@ -859,11 +859,7 @@ int is_double_prefix(char *c)
if((c[i]=='.')&&(dot==-1))
{
dot=i;
-
- if((dot!=0)&&(dot!=(int)strlen(c)-1))
- {
- continue;
- }
+ continue;
}
/* Last digit is prefix 'K', 'M', 'G' */
if( ((c[i]=='K')||(c[i]=='M')||(c[i]=='G')) && (i == (int)strlen(c)-1))