From 542f3ba0fbb7c016aa941298ad0e1346f160bc59 Mon Sep 17 00:00:00 2001 From: Chip Black Date: Sat, 22 Mar 2014 17:31:52 -0500 Subject: [PATCH] Fix up blerglatest --- tools/blerglatest.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/blerglatest.c b/tools/blerglatest.c index eaf887e..94c1679 100644 --- a/tools/blerglatest.c +++ b/tools/blerglatest.c @@ -33,6 +33,7 @@ struct things * things_alloc() { things->len = 0; things->size = 65536; things->arr = malloc(sizeof(struct thing) * things->size); + return things; } void things_free(struct things *things) { @@ -88,7 +89,7 @@ struct things * latest_things(const char *path, const char *file, int minlen) { perror(""); exit(1); } - while (f = readdir(d)) { + while ((f = readdir(d)) != NULL) { if (f->d_name[0] == '.') continue; if (minlen > 0 && strlen(f->d_name) < minlen) continue; if (file) { @@ -113,7 +114,7 @@ void latest_tags(yajl_gen g) { unsigned int count = (things->len >= 50 ? 50 : things->len); yajl_gen_array_open(g); for (i = 0; i < count; i++) { - yajl_gen_string(g, things->arr[i].name, things->arr[i].len); + yajl_gen_string(g, (unsigned char *)things->arr[i].name, things->arr[i].len); } yajl_gen_array_close(g); @@ -151,7 +152,7 @@ int main(int argc, char *argv[]) { yajl_gen g = yajl_gen_alloc(&yajl_config, NULL); yajl_gen_map_open(g); - yajl_gen_string(g, "tags", 4); + yajl_gen_string(g, (unsigned char *)"tags", 4); latest_tags(g); @@ -159,7 +160,7 @@ int main(int argc, char *argv[]) { fwrite(buf, len, 1, stdout); yajl_gen_clear(g); - yajl_gen_string(g, "records", 7); + yajl_gen_string(g, (unsigned char *)"records", 7); latest_records(g); -- 2.34.1