X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2F_infotojson%2Finfotojson.c;h=460cb7fe1cd815154dca70ed4162ce16b72eb090;hp=86769bbccc59c1ac215773413dfbae570d930fcb;hb=e52dc42bad9a6637fbec44fe08705a51f6f84a94;hpb=909bf610f3dfdd5386c7cac24997fd2a72390ace diff --git a/tools/_infotojson/infotojson.c b/tools/_infotojson/infotojson.c index 86769bbc..460cb7fe 100644 --- a/tools/_infotojson/infotojson.c +++ b/tools/_infotojson/infotojson.c @@ -1,36 +1,6 @@ /* This extract info from _info.c and create json file and also optionally store to db */ #include "infotojson.h" -/* This version adds one byte (for nul term) */ -static void *grab_file(void *ctx, const char *filename) -{ - unsigned int max = 16384, size = 0; - int ret, fd; - char *buffer; - - if (streq(filename, "-")) - fd = dup(STDIN_FILENO); - else - fd = open(filename, O_RDONLY, 0); - - if (fd < 0) - return NULL; - - buffer = talloc_array(ctx, char, max+1); - while ((ret = read(fd, buffer + size, max - size)) > 0) { - size += ret; - if (size == max) - buffer = talloc_realloc(ctx, buffer, char, max*=2 + 1); - } - if (ret < 0) { - talloc_free(buffer); - buffer = NULL; - } else - buffer[size] = '\0'; - close(fd); - return buffer; -} - /*creating json structure for storing to file/db*/ static struct json *createjson(char **infofile, char *author) { @@ -56,10 +26,6 @@ static struct json *createjson(char **infofile, char *author) if (!jsonobj->module) errx(1, "talloc error"); - //jsonobj->module = (char *)palloc(sizeof(char) * (modulename - 1)); - //strncpy(jsonobj->module, infofile[0], modulename - 1); - //jsonobj->module[modulename - 1] = '\0'; - jsonobj->title = infofile[0]; jsonobj->desc = &infofile[1];