From 8d561cd94e3bd6ed496eac9bffd4b221e37d4207 Mon Sep 17 00:00:00 2001
From: Petri Lehtinen <petri@digip.org>
Date: Tue, 30 Dec 2014 08:44:36 +0200
Subject: [PATCH] examples/simple_parse.c: Reindent, fix warnings & style

---
 examples/simple_parse.c | 169 +++++++++++++++++++++-------------------
 1 file changed, 88 insertions(+), 81 deletions(-)

diff --git a/examples/simple_parse.c b/examples/simple_parse.c
index 945cf0f..044337b 100644
--- a/examples/simple_parse.c
+++ b/examples/simple_parse.c
@@ -15,7 +15,7 @@
  *   JSON Object of 1 pair:
  *     JSON Key: "name"
  *     JSON String: "barney"
- * 
+ *
  * Copyright (c) 2014 Robert Poor <rdpoor@gmail.com>
  *
  * Jansson is free software; you can redistribute it and/or modify
@@ -24,7 +24,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "jansson.h"
+#include <jansson.h>
 
 /* forward refs */
 void print_json(json_t *root);
@@ -41,119 +41,126 @@ void print_json_false(json_t *element, int indent);
 void print_json_null(json_t *element, int indent);
 
 void print_json(json_t *root) {
-  print_json_aux(root, 0);
+    print_json_aux(root, 0);
 }
 
 void print_json_aux(json_t *element, int indent) {
-  switch json_typeof(element) {
+    switch (json_typeof(element)) {
     case JSON_OBJECT:
-      print_json_object(element, indent);
-      break;
+        print_json_object(element, indent);
+        break;
     case JSON_ARRAY:
-      print_json_array(element, indent);
-      break;
+        print_json_array(element, indent);
+        break;
     case JSON_STRING:
-      print_json_string(element, indent);
-      break;
+        print_json_string(element, indent);
+        break;
     case JSON_INTEGER:
-      print_json_integer(element, indent);
-      break;
+        print_json_integer(element, indent);
+        break;
     case JSON_REAL:
-      print_json_real(element, indent);
-      break;
+        print_json_real(element, indent);
+        break;
     case JSON_TRUE:
-      print_json_true(element, indent);
-      break;
+        print_json_true(element, indent);
+        break;
     case JSON_FALSE:
-      print_json_false(element, indent);
-      break;
+        print_json_false(element, indent);
+        break;
     case JSON_NULL:
-      print_json_null(element, indent);
-      break;
+        print_json_null(element, indent);
+        break;
     default:
-      fprintf(stderr, "unrecognized JSON type %d\n", json_typeof(element));
+        fprintf(stderr, "unrecognized JSON type %d\n", json_typeof(element));
     }
 }
 
 void print_json_indent(int indent) {
-  for (int i=0; i<indent; i++) { putchar(' '); }
+    int i;
+    for (i = 0; i < indent; i++) { putchar(' '); }
 }
 
 const char *json_plural(int count) {
-  return count == 1 ? "" : "s";
+    return count == 1 ? "" : "s";
 }
 
 void print_json_object(json_t *element, int indent) {
-  print_json_indent(indent);
-  size_t size = json_object_size(element);
-  const char *key;
-  json_t *value;
+    size_t size;
+    const char *key;
+    json_t *value;
 
-  printf("JSON Object of %ld pair%s:\n", size, json_plural(size));
-  json_object_foreach(element, key, value) {
-    print_json_indent(indent + 2);
-    printf("JSON Key: \"%s\"\n", key);
-    print_json_aux(value, indent + 2);
-  }
+    print_json_indent(indent);
+    size = json_object_size(element);
+
+    printf("JSON Object of %ld pair%s:\n", size, json_plural(size));
+    json_object_foreach(element, key, value) {
+        print_json_indent(indent + 2);
+        printf("JSON Key: \"%s\"\n", key);
+        print_json_aux(value, indent + 2);
+    }
 
 }
 
 void print_json_array(json_t *element, int indent) {
-  print_json_indent(indent);
-  size_t size = json_array_size(element);
+    size_t i;
+    size_t size = json_array_size(element);
+    print_json_indent(indent);
 
-  printf("JSON Array of %ld element%s:\n", size, json_plural(size));
-  for (size_t i=0; i<size; i++) {
-    print_json_aux(json_array_get(element, i), indent + 2);
-  }
+    printf("JSON Array of %ld element%s:\n", size, json_plural(size));
+    for (i = 0; i < size; i++) {
+        print_json_aux(json_array_get(element, i), indent + 2);
+    }
 }
 
 void print_json_string(json_t *element, int indent) {
-  print_json_indent(indent);
-  printf("JSON String: \"%s\"\n", json_string_value(element));
+    print_json_indent(indent);
+    printf("JSON String: \"%s\"\n", json_string_value(element));
 }
 
 void print_json_integer(json_t *element, int indent) {
-  print_json_indent(indent);
-  printf("JSON Integer: \"%" JSON_INTEGER_FORMAT "\"\n", json_integer_value(element));
+    print_json_indent(indent);
+    printf("JSON Integer: \"%" JSON_INTEGER_FORMAT "\"\n", json_integer_value(element));
 }
 
 void print_json_real(json_t *element, int indent) {
-  print_json_indent(indent);
-  printf("JSON Real: %f\n", json_real_value(element));
+    print_json_indent(indent);
+    printf("JSON Real: %f\n", json_real_value(element));
 }
 
 void print_json_true(json_t *element, int indent) {
-  print_json_indent(indent);
-  printf("JSON True\n");
+    (void)element;
+    print_json_indent(indent);
+    printf("JSON True\n");
 }
 
 void print_json_false(json_t *element, int indent) {
-  print_json_indent(indent);
-  printf("JSON False\n");
+    (void)element;
+    print_json_indent(indent);
+    printf("JSON False\n");
 }
 
 void print_json_null(json_t *element, int indent) {
-  print_json_indent(indent);
-  printf("JSON Null\n");
+    (void)element;
+    print_json_indent(indent);
+    printf("JSON Null\n");
 }
 
-/* 
+/*
  * Parse text into a JSON object. If text is valid JSON, returns a
  * json_t structure, otherwise prints and error and returns null.
  */
 json_t *load_json(const char *text) {
-  json_t *root;
-  json_error_t error;
+    json_t *root;
+    json_error_t error;
 
-  root = json_loads(text, 0, &error);
+    root = json_loads(text, 0, &error);
 
-  if (root) {
-    return root;
-  } else {
-    fprintf(stderr, "json error on line %d: %s\n", error.line, error.text);
-    return (json_t *)0;
-  }
+    if (root) {
+        return root;
+    } else {
+        fprintf(stderr, "json error on line %d: %s\n", error.line, error.text);
+        return (json_t *)0;
+    }
 }
 
 /*
@@ -161,9 +168,9 @@ json_t *load_json(const char *text) {
  * text.  Returns NULL on eof or some error.
  */
 char *read_line(char *line, int max_chars) {
-  printf("Type some JSON > ");
-  fflush(stdout);
-  return fgets(line, max_chars, stdin);
+    printf("Type some JSON > ");
+    fflush(stdout);
+    return fgets(line, max_chars, stdin);
 }
 
 /* ================================================================
@@ -173,24 +180,24 @@ char *read_line(char *line, int max_chars) {
 #define MAX_CHARS 4096
 
 int main(int argc, char *argv[]) {
-  char line[MAX_CHARS];
-  
-  if (argc != 1) {
-    fprintf(stderr, "Usage: %s\n", argv[0]);
-    exit(-1);
-  }
+    char line[MAX_CHARS];
 
-  while (read_line(line, MAX_CHARS) != (char *)NULL) {
-
-    /* parse text into JSON structure */
-    json_t *root = load_json(line);
-
-    if (root) {
-      /* print and release the JSON structure */
-      print_json(root);         
-      json_decref(root);
+    if (argc != 1) {
+        fprintf(stderr, "Usage: %s\n", argv[0]);
+        exit(-1);
     }
-  }
 
-  return 0;
+    while (read_line(line, MAX_CHARS) != (char *)NULL) {
+
+        /* parse text into JSON structure */
+        json_t *root = load_json(line);
+
+        if (root) {
+            /* print and release the JSON structure */
+            print_json(root);
+            json_decref(root);
+        }
+    }
+
+    return 0;
 }