summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--TODO1
-rw-r--r--include/common.h2
-rw-r--r--src/libs/zbxcommon/misc.c15
4 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 94dc29da..7d541d5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
Changes for 1.1beta9:
+ - better function is_double() (Alexei)
- fixed host conditions in actions (Alexei)
- improved filter by hosts and groups (Eugene)
- fixed processing of trapped items when a key contains '\' (Alexei)
diff --git a/TODO b/TODO
index 758ed405..a0d2a16d 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,6 @@
1.1beta8:
+ - fix bulkloader
- item key popup, trigger expression builder
- remember different default values in different forms
- create triggers from items
diff --git a/include/common.h b/include/common.h
index 4a38b194..75b8afb2 100644
--- a/include/common.h
+++ b/include/common.h
@@ -369,7 +369,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);
-int is_double_prefix(char *c);
+int is_double_prefix(char *str);
int is_double(char *c);
int is_uint(char *c);
void lrtrim_spaces(char *c);
diff --git a/src/libs/zbxcommon/misc.c b/src/libs/zbxcommon/misc.c
index 3e709318..6c5ff3d4 100644
--- a/src/libs/zbxcommon/misc.c
+++ b/src/libs/zbxcommon/misc.c
@@ -120,6 +120,19 @@ int is_double_prefix(char *c)
* Comments: *
* *
******************************************************************************/
+int is_double(char *str)
+{
+ const char *endstr = str + strlen(str);
+ char *endptr = NULL;
+ double x = strtod(str, &endptr);
+
+ if(endptr == str || errno != 0)
+ return FAIL;
+ if (endptr == endstr)
+ return SUCCEED;
+ return FAIL;
+}
+/*
int is_double(char *c)
{
int i;
@@ -145,7 +158,7 @@ int is_double(char *c)
return FAIL;
}
return SUCCEED;
-}
+}*/
/******************************************************************************
* *