X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=25691dc36839d6b38f9ea2061fcbf0f23378a4ba;hp=d6ad01fedd354da89efaa9bac27c6b44921cd180;hb=49b5a4d2e8e4fb1e4f67c2a368d8d2e3e76b765f;hpb=eb1b9560958c3458eab599e4e1577771ab4aa05c

diff --git a/src/core/store.c b/src/core/store.c
index d6ad01f..25691dc 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -43,6 +43,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <math.h>
 #include <pthread.h>
 
 /*
@@ -255,7 +256,7 @@ static sdb_type_t sdb_attribute_type = {
  */
 
 static sdb_host_t *
-lookup_host(const char *name, _Bool canonicalize)
+lookup_host(const char *name, bool canonicalize)
 {
 	sdb_host_t *host;
 	char *cname;
@@ -480,8 +481,13 @@ ts_tojson(sdb_timeseries_t *ts, sdb_strbuf_t *buf)
 				snprintf(time_str, sizeof(time_str), "<error>");
 			time_str[sizeof(time_str) - 1] = '\0';
 
-			sdb_strbuf_append(buf, "{\"timestamp\": \"%s\", "
-					"\"value\": \"%f\"}", time_str, ts->data[i][j].value);
+			/* Some GNU libc versions may print '-nan' which we dont' want */
+			if (isnan(ts->data[i][j].value))
+				sdb_strbuf_append(buf, "{\"timestamp\": \"%s\", "
+						"\"value\": \"nan\"}", time_str);
+			else
+				sdb_strbuf_append(buf, "{\"timestamp\": \"%s\", "
+						"\"value\": \"%f\"}", time_str, ts->data[i][j].value);
 
 			if (j < ts->data_len - 1)
 				sdb_strbuf_append(buf, ",");
@@ -534,7 +540,7 @@ sdb_store_host(const char *name, sdb_time_t last_update)
 	return status;
 } /* sdb_store_host */
 
-_Bool
+bool
 sdb_store_has_host(const char *name)
 {
 	sdb_host_t *host;
@@ -872,7 +878,6 @@ sdb_store_get_field(sdb_store_obj_t *obj, int field, sdb_data_t *res)
 			tmp.data.array.length = obj->backends_num;
 			tmp.data.array.values = obj->backends;
 			return sdb_data_copy(res, &tmp);
-			break;
 		}
 		default:
 			return -1;