Browse Source

Make json encoded errormsgs part of api.c for general use

master
ckolivas 10 years ago
parent
commit
80be061c3d
  1. 28
      src/generator.c

28
src/generator.c

@ -12,7 +12,6 @@
#include <sys/epoll.h> #include <sys/epoll.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <jansson.h> #include <jansson.h>
#include <stdarg.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
@ -2120,33 +2119,6 @@ static void send_list(gdata_t *gdata, const int sockd)
send_api_response(val, sockd); send_api_response(val, sockd);
} }
static json_t *_json_encode_errormsg(json_error_t *err_val, const char *func)
{
json_t *ret;
char *buf;
ASPRINTF(&buf, "Failed to JSON decode in %s (%d):%s", func, err_val->line, err_val->text);
JSON_CPACK(ret, "{ss}", "errormsg", buf);
free(buf);
return ret;
}
#define json_encode_errormsg(err_val) _json_encode_errormsg(err_val, __func__)
static json_t *json_errormsg(const char *fmt, ...)
{
char *buf = NULL;
json_t *ret;
va_list ap;
va_start(ap, fmt);
VASPRINTF(&buf, fmt, ap);
va_end(ap);
JSON_CPACK(ret, "{ss}", "errormsg", buf);
free(buf);
return ret;
}
static void send_sublist(gdata_t *gdata, const int sockd, const char *buf) static void send_sublist(gdata_t *gdata, const int sockd, const char *buf)
{ {
proxy_instance_t *proxy, *subproxy, *tmp; proxy_instance_t *proxy, *subproxy, *tmp;

Loading…
Cancel
Save