X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flp_json.c;h=f050307b28386ac00a23ce30335c1f89ac8548e5;hb=586361f5da21ef8e34987db0c628af1fb06df6a1;hp=c3345fdbdee17b8a92869a3e8ce9c45c84fa94f9;hpb=9a8af404ffbfb331575dc4b37b044d49d728be8b;p=ppastats.git

diff --git a/src/lp_json.c b/src/lp_json.c
index c3345fd..f050307 100644
--- a/src/lp_json.c
+++ b/src/lp_json.c
@@ -23,8 +23,9 @@
 #include <string.h>
 #include <time.h>
 
-#include "lp_json.h"
-#include "lp_ws.h"
+#include <lp_json.h>
+#include <lp_ws.h>
+#include <ptime.h>
 
 static time_t json_to_time(json_object *json)
 {
@@ -47,16 +48,20 @@ static time_t json_to_time(json_object *json)
 		return -1;
 }
 
-static json_object *time_to_json(time_t t)
+json_object *time_to_json(time_t t)
 {
 	char *str;
+	json_object *j;
 
-	str = time_to_str(t);
+	str = time_to_ISO8601_time(&t);
 
-	if (str)
-		return json_object_new_string(str);
-	else
+	if (str) {
+		j = json_object_new_string(str);
+		free(str);
+		return j;
+	} else {
 		return NULL;
+	}
 }
 
 static struct bpph *json_to_bpph(json_object *o)
@@ -102,7 +107,7 @@ static struct bpph *json_to_bpph(json_object *o)
 
 static json_object *bpph_to_json(struct bpph *bpph)
 {
-	json_object *json;
+	json_object *json, *time;
 
 	json = json_object_new_object();
 
@@ -132,8 +137,9 @@ static json_object *bpph_to_json(struct bpph *bpph)
 	json_object_object_add
 		(json, "status", json_object_new_string(bpph->status));
 
+	time = time_to_json(bpph->date_created);
 	json_object_object_add
-		(json, "date_created", time_to_json(bpph->date_created));
+		(json, "date_created", time);
 
 	return json;
 }