From c328f6c002446245ae81fc5f6009555ef71d071c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Mon, 28 Jun 2021 10:58:50 +0800 Subject: Handle whose status is other than 200 At the same time, refactor the JSON handling. --- handler.h | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) (limited to 'handler.h') diff --git a/handler.h b/handler.h index fa5e000..55fa095 100644 --- a/handler.h +++ b/handler.h @@ -2,23 +2,11 @@ #include #include "pikul.h" -enum { - CODE, - NAME, - ETD, - COST, - OBJECTS -}; - -struct container { - struct pikul_services **services; - const char **keys[7]; -}; - extern json_tokener *tokener; void recurse(struct json_object *, const char *[], struct json_object **); -inline void handle(const char *contents, size_t num_bytes, struct container *container) +inline void handle_services(const char *contents, size_t num_bytes, const char *status_trail[], + const char *services_trail[], const char *attributes[], struct pikul_services **services) { json_object *response = json_tokener_parse_ex(tokener, contents, num_bytes); enum json_tokener_error error = json_tokener_get_error(tokener); @@ -31,33 +19,38 @@ inline void handle(const char *contents, size_t num_bytes, struct container *con } } else if (!json_object_is_type(response, json_type_object) || error != json_tokener_success) return; - struct json_object *services = NULL; - recurse(response, &(*container->keys)[OBJECTS], &services); - size_t length = json_object_array_length(services); - *(container->services) = malloc(sizeof(struct pikul_services) + struct json_object *status = NULL; + recurse(response, status_trail, &status); + if (json_object_get_int(status) != 200) + return; + struct json_object *objects = NULL; + recurse(response, services_trail, &objects); + size_t length = json_object_array_length(objects); + *services = malloc(sizeof(struct pikul_services) + sizeof(struct pikul_service *[length])); - (*(container->services))->length = length; + (*services)->length = length; + enum { CODE, NAME, ETD, COST }; for (size_t i = 0; i < length; i++) { - (*(container->services))->list[i] = malloc(sizeof(struct pikul_service)); - struct pikul_service *service = (*(container->services))->list[i]; - json_object *object = json_object_array_get_idx(services, i); + (*services)->list[i] = malloc(sizeof(struct pikul_service)); + struct pikul_service *service = (*services)->list[i]; + json_object *object = json_object_array_get_idx(objects, i); struct json_object_iterator iterator = json_object_iter_begin(object); struct json_object_iterator iterator_end = json_object_iter_end(object); while (!json_object_iter_equal(&iterator, &iterator_end)) { const char *key = json_object_iter_peek_name(&iterator); json_object *val = json_object_iter_peek_value(&iterator); - if (!strcmp(key, (*container->keys)[COST])) + if (!strcmp(key, attributes[COST])) service->cost = json_object_get_double(val); else { int len = json_object_get_string_len(val); if (len) { char *value = malloc(len + 1); strcpy(value, json_object_get_string(val)); - if (!strcmp(key, (*container->keys)[CODE])) + if (!strcmp(key, attributes[CODE])) service->code = value; - else if (!strcmp(key, (*container->keys)[NAME])) + else if (!strcmp(key, attributes[NAME])) service->name = value; - else if (!strcmp(key, (*container->keys)[ETD])) + else if (!strcmp(key, attributes[ETD])) service->etd = value; } } -- cgit v1.2.3