Reindent all, except wordsplit, which is shared with MU.

1 files changed, 90 insertions, 132 deletions

diff --git a/src/preproc.c b/src/preproc.c
index 7ea9442..06924c1 100644
--- a/src/preproc.c
+++ b/src/preproc.c
@@ -34,14 +34,12 @@
 int grecs_log_to_stderr = 1;
 void (*grecs_log_setup_hook) () = NULL;
 
-struct input_file_ident
-{
+struct input_file_ident {
         ino_t i_node;
         dev_t device;
 };
 
-struct buffer_ctx
-{
+struct buffer_ctx {
         struct buffer_ctx *prev;        /* Pointer to previous context */
         grecs_locus_t locus;            /* Current input location */
         size_t namelen;         /* Length of the file name */
@@ -75,19 +73,12 @@ pp_getline (char **pbuf, size_t *psize, FILE *fp)
         size_t size = *psize;
         ssize_t off = 0;
   
-  do
-    {
-      size_t len;
-
-      if (off == size - 1)
-        {
-          if (!buf)
-            {
+        do {
+                if (off == size - 1) {
+                        if (!buf) {
                                 size = 1;
                                 buf = grecs_malloc(size);
-            }
-          else
-            {
+                        } else {
                                 size_t nsize = 2 * size;
                                 if (nsize < size)
                                         grecs_alloc_die();
@@ -95,8 +86,7 @@ pp_getline (char **pbuf, size_t *psize, FILE *fp)
                                 size = nsize;
                         }
                 }
-      if (!fgets (buf + off, size - off, fp))
-        {
+                if (!fgets(buf + off, size - off, fp)) {
                         if (off == 0)
                                 off = -1;
                         break;
@@ -110,7 +100,6 @@ pp_getline (char **pbuf, size_t *psize, FILE *fp)
         return off;
 }
       
-
 static void
 putback(const char *str)
 {
@@ -119,8 +108,7 @@ putback (const char *str)
         if (!*str)
                 return;
         len = strlen(str) + 1;
-  if (len > putback_max)
-    {
+        if (len > putback_max) {
                 putback_max = len;
                 putback_buffer = grecs_realloc(putback_buffer, putback_max);
         }
@@ -134,7 +122,8 @@ pp_line_stmt ()
         size_t ls_size;
         size_t pb_size;
 
-  if (grecs_asprintf (&linebufbase, &linebufsize, "#line %lu \"%s\" %lu\n",
+        if (grecs_asprintf(&linebufbase, &linebufsize,
+                           "#line %lu \"%s\" %lu\n",
                            (unsigned long) LOCUS.line,
                            LOCUS.file, (unsigned long) context_stack->xlines))
                 grecs_alloc_die();
@@ -142,8 +131,7 @@ pp_line_stmt ()
         ls_size = strlen(linebufbase);
         pb_size = putback_size + ls_size + 1;
 
-  if (pb_size > putback_max)
-    {
+        if (pb_size > putback_max) {
                 putback_max = pb_size;
                 putback_buffer = grecs_realloc(putback_buffer, putback_max);
         }
@@ -162,12 +150,9 @@ next_line ()
 {
         ssize_t rc;
 
-  do
-    {
-      if (putback_size)
-        {
-          if (putback_size + 1 > bufsize)
-            {
+        do {
+                if (putback_size) {
+                        if (putback_size + 1 > bufsize) {
                                 bufsize = putback_size + 1;
                                 linebuf = grecs_realloc(linebuf, bufsize);
                         }
@@ -179,8 +164,7 @@ next_line ()
                         return 0;
                 else
                         rc = pp_getline(&linebuf, &bufsize, INFILE);
-    }
-  while (rc == -1 && pop_source () == 0);
+        } while (rc == -1 && pop_source() == 0);
         return rc;
 }
 
@@ -189,33 +173,27 @@ grecs_preproc_fill_buffer (char *buf, size_t size)
 {
         size_t bufsize = size;
 
-  while (next_line () > 0)
-    {
+        while (next_line() > 0) {
                 char *p;
                 size_t len;
                 int is_line = 0;
                 
                 for (p = linebuf; *p && isspace(*p); p++)
                         ;
-      if (*p == '#')
-        {
+                if (*p == '#') {
                         size_t l;
                         for (p++; *p && isspace(*p); p++)
                                 ;
                         l = strlen(p);
-          if (STRMATCH (p, l, "include_once"))
-            {
+                        if (STRMATCH(p, l, "include_once")) {
                                 if (parse_include(linebuf, 1))
                                         putback("/*include_once*/\n");
                                 continue;
-            }
-          else if (STRMATCH (p, l, "include"))
-            {
+                        } else if (STRMATCH(p, l, "include")) {
                                 if (parse_include(linebuf, 0))
                                         putback("/*include*/\n");
                                 continue;
-            }
-          else if (STRMATCH (p, l, "line"))
+                        } else if (STRMATCH(p, l, "line"))
                                 is_line = 1;
                 }
 
@@ -228,8 +206,7 @@ grecs_preproc_fill_buffer (char *buf, size_t size)
                 buf += len;
                 size -= len;
                 
-      if (size == 0)
-        {
+                if (size == 0) {
                         putback(linebuf + len);
                         break;
                 }
@@ -261,8 +238,7 @@ const char *grecs_preprocessor = NULL;
 static struct grecs_list *include_path;
 static struct grecs_list *std_include_path;
 
-struct file_data
-{
+struct file_data {
         const char *name;
         size_t namelen;
         char *buf;
@@ -275,12 +251,10 @@ pp_list_find (struct grecs_list *list, struct file_data *dptr)
 {
         struct grecs_list_entry *ep;
         
-  for (ep = list->head; !dptr->found && ep; ep = ep->next)
-    {
+        for (ep = list->head; !dptr->found && ep; ep = ep->next) {
                 const char *dir = ep->data;
                 size_t size = strlen (dir) + 1 + dptr->namelen + 1;
-      if (size > dptr->buflen)
-        {
+                if (size > dptr->buflen) {
                         dptr->buflen = size;
                         dptr->buf = grecs_realloc(dptr->buf, dptr->buflen);
                 }
@@ -292,18 +266,27 @@ pp_list_find (struct grecs_list *list, struct file_data *dptr)
         return dptr->found;
 }
 
+static void
+incl_free(void *data)
+{
+        free(data);
+}
+
 void
 grecs_include_path_setup_v(char **dirs)