1 files changed, 312 insertions, 310 deletions

diff --git a/src/regex/gnunet-regex-simulation-profiler.c b/src/regex/gnunet-regex-simulation-profiler.c
index aa297d2ea..6637bafed 100644
--- a/src/regex/gnunet-regex-simulation-profiler.c
+++ b/src/regex/gnunet-regex-simulation-profiler.c
@@ -52,7 +52,8 @@
  * Simple struct to keep track of progress, and print a
  * nice little percentage meter for long running tasks.
  */
-struct ProgressMeter {
+struct ProgressMeter
+{
   /**
    * Total number of elements.
    */
@@ -167,11 +168,11 @@ static char *regex_prefix;
  * @return the progress meter
  */
 static struct ProgressMeter *
-create_meter(unsigned int total, char *start_string, int print)
+create_meter (unsigned int total, char *start_string, int print)
 {
   struct ProgressMeter *ret;
 
-  ret = GNUNET_new(struct ProgressMeter);
+  ret = GNUNET_new (struct ProgressMeter);
   ret->print = print;
   ret->total = total;
   ret->modnum = total / 4;
@@ -179,9 +180,9 @@ create_meter(unsigned int total, char *start_string, int print)
     ret->modnum = 1;
   ret->dotnum = (total / 50) + 1;
   if (start_string != NULL)
-    ret->startup_string = GNUNET_strdup(start_string);
+    ret->startup_string = GNUNET_strdup (start_string);
   else
-    ret->startup_string = GNUNET_strdup("");
+    ret->startup_string = GNUNET_strdup ("");
 
   return ret;
 }
@@ -196,33 +197,33 @@ create_meter(unsigned int total, char *start_string, int print)
  *         GNUNET_NO if more items expected
  */
 static int
-update_meter(struct ProgressMeter *meter)
+update_meter (struct ProgressMeter *meter)
 {
   if (meter->print == GNUNET_YES)
+  {
+    if (meter->completed % meter->modnum == 0)
     {
-      if (meter->completed % meter->modnum == 0)
-        {
-          if (meter->completed == 0)
-            {
-              fprintf(stdout, "%sProgress: [0%%", meter->startup_string);
-            }
-          else
-            fprintf(stdout, "%d%%",
-                    (int)(((float)meter->completed / meter->total) * 100));
-        }
-      else if (meter->completed % meter->dotnum == 0)
-        fprintf(stdout, "%s", ".");
-
-      if (meter->completed + 1 == meter->total)
-        fprintf(stdout, "%d%%]\n", 100);
-      fflush(stdout);
+      if (meter->completed == 0)
+      {
+        fprintf (stdout, "%sProgress: [0%%", meter->startup_string);
+      }
+      else
+        fprintf (stdout, "%d%%",
+                 (int) (((float) meter->completed / meter->total) * 100));
     }
+    else if (meter->completed % meter->dotnum == 0)
+      fprintf (stdout, "%s", ".");
+
+    if (meter->completed + 1 == meter->total)
+      fprintf (stdout, "%d%%]\n", 100);
+    fflush (stdout);
+  }
   meter->completed++;
 
   if (meter->completed == meter->total)
     return GNUNET_YES;
   if (meter->completed > meter->total)
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Progress meter overflow!!\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Progress meter overflow!!\n");
   return GNUNET_NO;
 }
 
@@ -236,7 +237,7 @@ update_meter(struct ProgressMeter *meter)
  *         #GNUNET_SYSERR on error
  */
 static int
-reset_meter(struct ProgressMeter *meter)
+reset_meter (struct ProgressMeter *meter)
 {
   if (meter == NULL)
     return GNUNET_SYSERR;
@@ -252,10 +253,10 @@ reset_meter(struct ProgressMeter *meter)
  * @param meter the meter to free
  */
 static void
-free_meter(struct ProgressMeter *meter)
+free_meter (struct ProgressMeter *meter)
 {
-  GNUNET_free_non_null(meter->startup_string);
-  GNUNET_free(meter);
+  GNUNET_free_non_null (meter->startup_string);
+  GNUNET_free (meter);
 }
 
 
@@ -265,18 +266,18 @@ free_meter(struct ProgressMeter *meter)
  * @param cls NULL
  */
 static void
-do_shutdown(void *cls)
+do_shutdown (void *cls)
 {
   if (NULL != mysql_ctx)
-    {
-      GNUNET_MYSQL_context_destroy(mysql_ctx);
-      mysql_ctx = NULL;
-    }
+  {
+    GNUNET_MYSQL_context_destroy (mysql_ctx);
+    mysql_ctx = NULL;
+  }
   if (NULL != meter)
-    {
-      free_meter(meter);
-      meter = NULL;
-    }
+  {
+    free_meter (meter);
+    meter = NULL;
+  }
 }
 
 
@@ -292,16 +293,16 @@ do_shutdown(void *cls)
  * @param cls NULL
  */
 static void
-do_abort(void *cls)
+do_abort (void *cls)
 {
-  GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Aborting\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Aborting\n");
   if (NULL != scan_task)
-    {
-      GNUNET_SCHEDULER_cancel(scan_task);
-      scan_task = NULL;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (scan_task);
+    scan_task = NULL;
+  }
   result = GNUNET_SYSERR;
-  GNUNET_SCHEDULER_shutdown();
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 /**
@@ -315,131 +316,131 @@ do_abort(void *cls)
  * @param edges edges leaving current state.
  */
 static void
-regex_iterator(void *cls,
-               const struct GNUNET_HashCode *key,
-               const char *proof,
-               int accepting,
-               unsigned int num_edges,
-               const struct REGEX_BLOCK_Edge *edges)
+regex_iterator (void *cls,
+                const struct GNUNET_HashCode *key,
+                const char *proof,
+                int accepting,
+                unsigned int num_edges,
+                const struct REGEX_BLOCK_Edge *edges)
 {
   unsigned int i;
   int result;
 
-  uint32_t iaccepting = (uint32_t)accepting;
+  uint32_t iaccepting = (uint32_t) accepting;
   uint64_t total;
 
-  GNUNET_assert(NULL != mysql_ctx);
+  GNUNET_assert (NULL != mysql_ctx);
 
   for (i = 0; i < num_edges; i++)
+  {
+    struct GNUNET_MY_QueryParam params_select[] = {
+      GNUNET_MY_query_param_auto_from_type (key),
+      GNUNET_MY_query_param_string (edges[i].label),
+      GNUNET_MY_query_param_end
+    };
+
+    struct GNUNET_MY_ResultSpec results_select[] = {
+      GNUNET_MY_result_spec_uint64 (&total),
+      GNUNET_MY_result_spec_end
+    };
+
+    result =
+      GNUNET_MY_exec_prepared (mysql_ctx,
+                               select_stmt_handle,
+                               params_select);
+
+    if (GNUNET_SYSERR == result)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Error executing prepared mysql select statement\n");
+      GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+      return;
+    }
+
+    result =
+      GNUNET_MY_extract_result (select_stmt_handle,
+                                results_select);
+
+    if (GNUNET_SYSERR == result)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Error extracting result mysql select statement\n");
+      GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+      return;
+    }
+
+    if ((-1 != total) &&(total > 0) )
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Total: %llu (%s, %s)\n",
+                  (unsigned long long) total,
+                  GNUNET_h2s (key), edges[i].label);
+    }
+
+    struct GNUNET_MY_QueryParam params_stmt[] = {
+      GNUNET_MY_query_param_auto_from_type (&key),
+      GNUNET_MY_query_param_string (edges[i].label),
+      GNUNET_MY_query_param_auto_from_type (&edges[i].destination),
+      GNUNET_MY_query_param_uint32 (&iaccepting),
+      GNUNET_MY_query_param_end
+    };
+
+    result =
+      GNUNET_MY_exec_prepared (mysql_ctx,
+                               stmt_handle,
+                               params_stmt);
+
+    if (0 == result)
+    {
+      char *key_str = GNUNET_strdup (GNUNET_h2s (key));
+      char *to_key_str = GNUNET_strdup (GNUNET_h2s (&edges[i].destination));
+
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Merged (%s, %s, %s, %i)\n",
+                  key_str,
+                  edges[i].label,
+                  to_key_str,
+                  accepting);
+
+      GNUNET_free (key_str);
+      GNUNET_free (to_key_str);
+      num_merged_transitions++;
+    }
+    else if (-1 != total)
+    {
+      num_merged_states++;
+    }
+
+    if ((GNUNET_SYSERR == result) || ((1 != result) &&(0 != result) ))
     {
-      struct GNUNET_MY_QueryParam params_select[] = {
-        GNUNET_MY_query_param_auto_from_type(key),
-        GNUNET_MY_query_param_string(edges[i].label),
-        GNUNET_MY_query_param_end
-      };
-
-      struct GNUNET_MY_ResultSpec results_select[] = {
-        GNUNET_MY_result_spec_uint64(&total),
-        GNUNET_MY_result_spec_end
-      };
-
-      result =
-        GNUNET_MY_exec_prepared(mysql_ctx,
-                                select_stmt_handle,
-                                params_select);
-
-      if (GNUNET_SYSERR == result)
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                     "Error executing prepared mysql select statement\n");
-          GNUNET_SCHEDULER_add_now(&do_abort, NULL);
-          return;
-        }
-
-      result =
-        GNUNET_MY_extract_result(select_stmt_handle,
-                                 results_select);
-
-      if (GNUNET_SYSERR == result)
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                     "Error extracting result mysql select statement\n");
-          GNUNET_SCHEDULER_add_now(&do_abort, NULL);
-          return;
-        }
-
-      if (-1 != total && total > 0)
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Total: %llu (%s, %s)\n",
-                     (unsigned long long)total,
-                     GNUNET_h2s(key), edges[i].label);
-        }
-
-      struct GNUNET_MY_QueryParam params_stmt[] = {
-        GNUNET_MY_query_param_auto_from_type(&key),
-        GNUNET_MY_query_param_string(edges[i].label),
-        GNUNET_MY_query_param_auto_from_type(&edges[i].destination),
-        GNUNET_MY_query_param_uint32(&iaccepting),
-        GNUNET_MY_query_param_end
-      };
-
-      result =
-        GNUNET_MY_exec_prepared(mysql_ctx,
-                                stmt_handle,
-                                params_stmt);
-
-      if (0 == result)
-        {
-          char *key_str = GNUNET_strdup(GNUNET_h2s(key));
-          char *to_key_str = GNUNET_strdup(GNUNET_h2s(&edges[i].destination));
-
-          GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Merged (%s, %s, %s, %i)\n",
-                     key_str,
-                     edges[i].label,
-                     to_key_str,
-                     accepting);
-
-          GNUNET_free(key_str);
-          GNUNET_free(to_key_str);
-          num_merged_transitions++;
-        }
-      else if (-1 != total)
-        {
-          num_merged_states++;
-        }
-
-      if (GNUNET_SYSERR == result || (1 != result && 0 != result))
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                     "Error executing prepared mysql statement for edge: Affected rows: %i, expected 0 or 1!\n",
-                     result);
-          GNUNET_SCHEDULER_add_now(&do_abort, NULL);
-        }
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Error executing prepared mysql statement for edge: Affected rows: %i, expected 0 or 1!\n",
+                  result);
+      GNUNET_SCHEDULER_add_now (&do_abort, NULL);
     }
+  }
 
   if (0 == num_edges)
+  {
+    struct GNUNET_MY_QueryParam params_stmt[] = {
+      GNUNET_MY_query_param_auto_from_type (key),
+      GNUNET_MY_query_param_string (""),
+      GNUNET_MY_query_param_fixed_size (NULL, 0),
+      GNUNET_MY_query_param_uint32 (&iaccepting),
+      GNUNET_MY_query_param_end
+    };
+
+    result =
+      GNUNET_MY_exec_prepared (mysql_ctx,
+                               stmt_handle,
+                               params_stmt);
+
+    if ((1 != result) &&(0 != result) )
     {
-      struct GNUNET_MY_QueryParam params_stmt[] = {
-        GNUNET_MY_query_param_auto_from_type(key),
-        GNUNET_MY_query_param_string(""),
-        GNUNET_MY_query_param_fixed_size(NULL, 0),
-        GNUNET_MY_query_param_uint32(&iaccepting),
-        GNUNET_MY_query_param_end
-      };
-
-      result =
-        GNUNET_MY_exec_prepared(mysql_ctx,
-                                stmt_handle,
-                                params_stmt);
-
-      if (1 != result && 0 != result)
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                     "Error executing prepared mysql statement for edge: Affected rows: %i, expected 0 or 1!\n",
-                     result);
-          GNUNET_SCHEDULER_add_now(&do_abort, NULL);
-        }
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Error executing prepared mysql statement for edge: Affected rows: %i, expected 0 or 1!\n",
+                  result);
+      GNUNET_SCHEDULER_add_now (&do_abort, NULL);
     }
+  }
 }
 
 
@@ -451,26 +452,26 @@ regex_iterator(void *cls,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure.
  */
 static int
-announce_regex(const char *regex)
+announce_regex (const char *regex)
 {
   struct REGEX_INTERNAL_Automaton *dfa;
 
   dfa =
-    REGEX_INTERNAL_construct_dfa(regex,
-                                 strlen(regex),
-                                 max_path_compression);
+    REGEX_INTERNAL_construct_dfa (regex,
+                                  strlen (regex),
+                                  max_path_compression);
 
   if (NULL == dfa)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 "Failed to create DFA for regex %s\n",
-                 regex);
-      GNUNET_SCHEDULER_add_now(&do_abort, NULL);
-      return GNUNET_SYSERR;
-    }
-  REGEX_INTERNAL_iterate_all_edges(dfa,
-                                   &regex_iterator, NULL);
-  REGEX_INTERNAL_automaton_destroy(dfa);
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to create DFA for regex %s\n",
+                regex);
+    GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+    return GNUNET_SYSERR;
+  }
+  REGEX_INTERNAL_iterate_all_edges (dfa,
+                                    &regex_iterator, NULL);
+  REGEX_INTERNAL_automaton_destroy (dfa);
 
   return GNUNET_OK;
 }
@@ -485,7 +486,7 @@ announce_regex(const char *regex)
  *  #GNUNET_SYSERR to abort iteration with error!
  */
 static int
-policy_filename_cb(void *cls, const char *filename)
+policy_filename_cb (void *cls, const char *filename)
 {
   char *regex;
   char *data;
@@ -493,70 +494,70 @@ policy_filename_cb(void *cls, const char *filename)
   uint64_t filesize;
   unsigned int offset;
 
-  GNUNET_assert(NULL != filename);
+  GNUNET_assert (NULL != filename);
 
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-             "Announcing regexes from file %s\n",
-             filename);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Announcing regexes from file %s\n",
+              filename);
 
-  if (GNUNET_YES != GNUNET_DISK_file_test(filename))
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
-                 "Could not find policy file %s\n",
-                 filename);
-      return GNUNET_OK;
-    }
+  if (GNUNET_YES != GNUNET_DISK_file_test (filename))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Could not find policy file %s\n",
+                filename);
+    return GNUNET_OK;
+  }
   if (GNUNET_OK !=
-      GNUNET_DISK_file_size(filename, &filesize,
-                            GNUNET_YES, GNUNET_YES))
+      GNUNET_DISK_file_size (filename, &filesize,
+                             GNUNET_YES, GNUNET_YES))
     filesize = 0;
   if (0 == filesize)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Policy file %s is empty.\n",
-                 filename);
-      return GNUNET_OK;
-    }
-  data = GNUNET_malloc(filesize);
-  if (filesize != GNUNET_DISK_fn_read(filename, data, filesize))
-    {
-      GNUNET_free(data);
-      GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
-                 "Could not read policy file %s.\n",
-                 filename);
-      return GNUNET_OK;
-    }
-
-  update_meter(meter);
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Policy file %s is empty.\n",
+                filename);
+    return GNUNET_OK;
+  }
+  data = GNUNET_malloc (filesize);
+  if (filesize != GNUNET_DISK_fn_read (filename, data, filesize))
+  {
+    GNUNET_free (data);
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Could not read policy file %s.\n",
+                filename);
+    return GNUNET_OK;
+  }
+
+  update_meter (meter);
 
   buf = data;
   offset = 0;
   regex = NULL;
   while (offset < (filesize - 1))
+  {
+    offset++;
+    if (((data[offset] == '\n')) && (buf != &data[offset]))
     {
-      offset++;
-      if (((data[offset] == '\n')) && (buf != &data[offset]))
-        {
-          data[offset] = '|';
-          num_policies++;
-          buf = &data[offset + 1];
-        }
-      else if ((data[offset] == '\n') || (data[offset] == '\0'))
-        buf = &data[offset + 1];
+      data[offset] = '|';
+      num_policies++;
+      buf = &data[offset + 1];
     }
+    else if ((data[offset] == '\n') || (data[offset] == '\0'))
+      buf = &data[offset + 1];
+  }
   data[offset] = '\0';
-  GNUNET_asprintf(&regex, "%s(%s)", regex_prefix, data);
-  GNUNET_assert(NULL != regex);
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Announcing regex: %s\n", regex);
-
-  if (GNUNET_OK != announce_regex(regex))
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 "Could not announce regex %s\n",
-                 regex);
-    }
-  GNUNET_free(regex);
-  GNUNET_free(data);
+  GNUNET_asprintf (&regex, "%s(%s)", regex_prefix, data);
+  GNUNET_assert (NULL != regex);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Announcing regex: %s\n", regex);
+
+  if (GNUNET_OK != announce_regex (regex))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not announce regex %s\n",
+                regex);
+  }
+  GNUNET_free (regex);
+  GNUNET_free (data);
   return GNUNET_OK;
 }
 
@@ -567,7 +568,7 @@ policy_filename_cb(void *cls, const char *filename)
  * @param cls NULL
  */
 static void
-do_directory_scan(void *cls)
+do_directory_scan (void *cls)
 {
   struct GNUNET_TIME_Absolute start_time;
   struct GNUNET_TIME_Relative duration;
@@ -575,37 +576,37 @@ do_directory_scan(void *cls)
 
   /* Create an MySQL prepared statement for the inserts */
   scan_task = NULL;
-  GNUNET_asprintf(&stmt, INSERT_EDGE_STMT, table_name);
-  stmt_handle = GNUNET_MYSQL_statement_prepare(mysql_ctx, stmt);
-  GNUNET_free(stmt);
-
-  GNUNET_asprintf(&stmt, SELECT_KEY_STMT, table_name);
-  select_stmt_handle = GNUNET_MYSQL_statement_prepare(mysql_ctx, stmt);
-  GNUNET_free(stmt);
-
-  GNUNET_assert(NULL != stmt_handle);
-
-  meter = create_meter(num_policy_files,
-                       "Announcing policy files\n",
-                       GNUNET_YES);
-  start_time = GNUNET_TIME_absolute_get();
-  GNUNET_DISK_directory_scan(policy_dir,
-                             &policy_filename_cb,
-                             stmt_handle);
-  duration = GNUNET_TIME_absolute_get_duration(start_time);
-  reset_meter(meter);
-  free_meter(meter);
+  GNUNET_asprintf (&stmt, INSERT_EDGE_STMT, table_name);
+  stmt_handle = GNUNET_MYSQL_statement_prepare (mysql_ctx, stmt);
+  GNUNET_free (stmt);
+
+  GNUNET_asprintf (&stmt, SELECT_KEY_STMT, table_name);
+  select_stmt_handle = GNUNET_MYSQL_statement_prepare (mysql_ctx, stmt);
+  GNUNET_free (stmt);
+
+  GNUNET_assert (NULL != stmt_handle);
+
+  meter = create_meter (num_policy_files,
+                        "Announcing policy files\n",
+                        GNUNET_YES);
+  start_time = GNUNET_TIME_absolute_get ();
+  GNUNET_DISK_directory_scan (policy_dir,
+                              &policy_filename_cb,
+                              stmt_handle);
+  duration = GNUNET_TIME_absolute_get_duration (start_time);
+  reset_meter (meter);
+  free_meter (meter);
   meter = NULL;
 
-  printf("Announced %u files containing %u policies in %s\n"
-         "Duplicate transitions: %llu\nMerged states: %llu\n",
-         num_policy_files,
-         num_policies,
-         GNUNET_STRINGS_relative_time_to_string(duration, GNUNET_NO),
-         num_merged_transitions,
-         num_merged_states);
+  printf ("Announced %u files containing %u policies in %s\n"
+          "Duplicate transitions: %llu\nMerged states: %llu\n",
+          num_policy_files,
+          num_policies,
+          GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_NO),
+          num_merged_transitions,
+          num_merged_states);
   result = GNUNET_OK;
-  GNUNET_SCHEDULER_shutdown();
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
@@ -618,65 +619,65 @@ do_directory_scan(void *cls)
  * @param config configuration
  */
 static void
-run(void *cls,
-    char *const *args,
-    const char *cfgfile,
-    const struct GNUNET_CONFIGURATION_Handle *config)
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *config)
 {
   if (NULL == args[0])
-    {
-      fprintf(stderr,
-              _("No policy directory specified on command line. Exiting.\n"));
-      result = GNUNET_SYSERR;
-      return;
-    }
+  {
+    fprintf (stderr,
+             _ ("No policy directory specified on command line. Exiting.\n"));
+    result = GNUNET_SYSERR;
+    return;
+  }
   if (GNUNET_YES !=
-      GNUNET_DISK_directory_test(args[0], GNUNET_YES))
-    {
-      fprintf(stderr,
-              _("Specified policies directory does not exist. Exiting.\n"));
-      result = GNUNET_SYSERR;
-      return;
-    }
+      GNUNET_DISK_directory_test (args[0], GNUNET_YES))
+  {
+    fprintf (stderr,
+             _ ("Specified policies directory does not exist. Exiting.\n"));
+    result = GNUNET_SYSERR;
+    return;
+  }
   policy_dir = args[0];
 
-  num_policy_files = GNUNET_DISK_directory_scan(policy_dir,
-                                                NULL, NULL);
+  num_policy_files = GNUNET_DISK_directory_scan (policy_dir,
+                                                 NULL, NULL);
   meter = NULL;
 
   if (NULL == table_name)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
-                 "No table name specified, using default \"NFA\".\n");
-      table_name = "NFA";
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "No table name specified, using default \"NFA\".\n");
+    table_name = "NFA";
+  }
 
-  mysql_ctx = GNUNET_MYSQL_context_create(config, "regex-mysql");
+  mysql_ctx = GNUNET_MYSQL_context_create (config, "regex-mysql");
   if (NULL == mysql_ctx)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                 "Failed to create mysql context\n");
-      result = GNUNET_SYSERR;
-      return;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to create mysql context\n");
+    result = GNUNET_SYSERR;
+    return;
+  }
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string(config,
-                                            "regex-mysql",
-                                            "REGEX_PREFIX",
-                                            &regex_prefix))
-    {
-      GNUNET_log_config_missing(GNUNET_ERROR_TYPE_ERROR,
-                                "regex-mysql",
-                                "REGEX_PREFIX");
-      result = GNUNET_SYSERR;
-      return;
-    }
+      GNUNET_CONFIGURATION_get_value_string (config,
+                                             "regex-mysql",
+                                             "REGEX_PREFIX",
+                                             &regex_prefix))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "regex-mysql",
+                               "REGEX_PREFIX");
+    result = GNUNET_SYSERR;
+    return;
+  }
 
   result = GNUNET_OK;
-  GNUNET_SCHEDULER_add_shutdown(&do_shutdown,
-                                NULL);
-  scan_task = GNUNET_SCHEDULER_add_now(&do_directory_scan, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+                                 NULL);
+  scan_task = GNUNET_SCHEDULER_add_now (&do_directory_scan, NULL);
 }
 
 
@@ -688,33 +689,34 @@ run(void *cls,
  * @return 0 on success
  */
 int
-main(int argc, char *const *argv)
+main (int argc, char *const *argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_option_string('t',
-                                "table",
-                                "TABLENAME",
-                                gettext_noop("name of the table to write DFAs"),
-                                &table_name),
-
-    GNUNET_GETOPT_option_uint('p',
-                              "max-path-compression",
-                              "MAX_PATH_COMPRESSION",
-                              gettext_noop("maximum path compression length"),
-                              &max_path_compression),
+    GNUNET_GETOPT_option_string ('t',
+                                 "table",
+                                 "TABLENAME",
+                                 gettext_noop (
+                                   "name of the table to write DFAs"),
+                                 &table_name),
+
+    GNUNET_GETOPT_option_uint ('p',
+                               "max-path-compression",
+                               "MAX_PATH_COMPRESSION",
+                               gettext_noop ("maximum path compression length"),
+                               &max_path_compression),
 
     GNUNET_GETOPT_OPTION_END
   };
   int ret;
 
-  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args(argc, argv, &argc, &argv))
+  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
 
   result = GNUNET_SYSERR;
   ret =
-    GNUNET_PROGRAM_run(argc, argv,
-                       "gnunet-regex-simulationprofiler [OPTIONS] policy-dir",
-                       _("Profiler for regex library"), options, &run, NULL);
+    GNUNET_PROGRAM_run (argc, argv,
+                        "gnunet-regex-simulationprofiler [OPTIONS] policy-dir",
+                        _ ("Profiler for regex library"), options, &run, NULL);
   if (GNUNET_OK != ret)
     return ret;
   if (GNUNET_OK != result)