diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | handler.c | 13 | ||||
| -rw-r--r-- | pikul.c | 14 |
3 files changed, 14 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index f5a691e..ff1a123 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ lib_LTLIBRARIES = libpikul.la -libpikul_la_SOURCES = pikul.c handler.c \ +libpikul_la_SOURCES = pikul.c \ anteraja.c libpikul_la_CPPFLAGS = $(DEPS_CFLAGS) libpikul_la_LDFLAGS = $(DEPS_LIBS) diff --git a/handler.c b/handler.c deleted file mode 100644 index 581001e..0000000 --- a/handler.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "handler.h" - -extern inline void handle(const char *, size_t, struct container *); - -void recurse(struct json_object *outer, const char *keys[], struct json_object **services) -{ - struct json_object *inner = NULL; - json_object_object_get_ex(outer, *keys, &inner); - if (*++keys) - recurse(inner, keys, services); - else - *services = inner; -} @@ -1,12 +1,14 @@ #include <string.h> -#include <json.h> #include "shipping.h" +#include "handler.h" CURL *curl; json_tokener *tokener; static struct shipping shipping; extern inline void headers(struct shipping *shipping, const char *fields[], char *provisions[]); +extern inline void handle(const char *, size_t, struct container *); + extern void anteraja_init(char *[], struct shipping *); extern void anteraja_services_request(const char *, const char *, double, struct shipping *, char **, char **); @@ -101,3 +103,13 @@ void pikul_cleanup() curl_easy_cleanup(curl); curl_global_cleanup(); } + +void recurse(struct json_object *outer, const char *keys[], struct json_object **services) +{ + struct json_object *inner = NULL; + json_object_object_get_ex(outer, *keys, &inner); + if (*++keys) + recurse(inner, keys, services); + else + *services = inner; +} |