Browse Source

Fix spaces

Ola Bini 8 years ago
parent
commit
ca927b7f63
4 changed files with 19 additions and 10 deletions
  1. 2 1
      src/common/procmon.c
  2. 6 4
      src/test/log_test_helpers.c
  3. 3 1
      src/test/log_test_helpers.h
  4. 8 4
      src/test/test_procmon.c

+ 2 - 1
src/common/procmon.c

@@ -192,7 +192,8 @@ tor_process_monitor_new(struct event_base *base,
                         tor_procmon_callback_t cb, void *cb_arg,
                         const char **msg)
 {
-    tor_process_monitor_t *procmon = tor_malloc_zero(sizeof(tor_process_monitor_t));
+  tor_process_monitor_t *procmon = tor_malloc_zero(
+                                       sizeof(tor_process_monitor_t));
   struct parsed_process_specifier_t ppspec;
 
   tor_assert(msg != NULL);

+ 6 - 4
src/test/log_test_helpers.c

@@ -37,20 +37,21 @@ const char *
 mock_saved_log_at(int ix)
 {
   int saved_log_count = mock_saved_log_number();
-  if(ix < 0) {
+  if (ix < 0) {
     ix = saved_log_count + ix;
   }
 
   if (saved_log_count <= ix)
     return "";
-  return ((mock_saved_log_entry_t *)smartlist_get(saved_logs, ix))->generated_msg;
+  return ((mock_saved_log_entry_t *)
+          smartlist_get(saved_logs, ix))->generated_msg;
 }
 
 int
 mock_saved_severity_at(int ix)
 {
   int saved_log_count = mock_saved_log_number();
-  if(ix < 0) {
+  if (ix < 0) {
     ix = saved_log_count + ix;
   }
 
@@ -74,7 +75,8 @@ mock_saved_logs(void)
 }
 
 void
-mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format, va_list ap)
+mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname,
+                 const char *suffix, const char *format, va_list ap)
 {
   (void)domain;
   char *buf = tor_malloc_zero(10240);

+ 3 - 1
src/test/log_test_helpers.h

@@ -15,7 +15,9 @@ typedef struct mock_saved_log_entry_t {
   struct mock_saved_log_entry_t *next;
 } mock_saved_log_entry_t;
 
-void mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format, va_list ap);
+void mock_saving_logv(int severity, log_domain_mask_t domain,
+                      const char *funcname, const char *suffix,
+                      const char *format, va_list ap);
 void mock_clean_saved_logs(void);
 const smartlist_t *mock_saved_logs(void);
 int setup_capture_of_logs(int new_level);

+ 8 - 4
src/test/test_procmon.c

@@ -29,15 +29,18 @@ test_procmon_tor_process_monitor_new(void *ignored)
   tt_assert(!res);
   tt_str_op(msg, OP_EQ, "invalid PID");
 
-  res = tor_process_monitor_new(tor_libevent_get_base(), "43", 0, NULL, NULL, &msg);
+  res = tor_process_monitor_new(tor_libevent_get_base(), "43", 0,
+                                NULL, NULL, &msg);
   tt_assert(res);
   tt_assert(!msg);
 
-  res = tor_process_monitor_new(tor_libevent_get_base(), "44 hello", 0, NULL, NULL, &msg);
+  res = tor_process_monitor_new(tor_libevent_get_base(), "44 hello", 0,
+                                NULL, NULL, &msg);
   tt_assert(res);
   tt_assert(!msg);
 
-  res = tor_process_monitor_new(tor_libevent_get_base(), "45:hello", 0, NULL, NULL, &msg);
+  res = tor_process_monitor_new(tor_libevent_get_base(), "45:hello", 0,
+                                NULL, NULL, &msg);
   tt_assert(res);
   tt_assert(!msg);
 
@@ -46,6 +49,7 @@ test_procmon_tor_process_monitor_new(void *ignored)
 }
 
 struct testcase_t procmon_tests[] = {
-  { "tor_process_monitor_new", test_procmon_tor_process_monitor_new, TT_FORK, NULL, NULL },
+  { "tor_process_monitor_new", test_procmon_tor_process_monitor_new,
+    TT_FORK, NULL, NULL },
   END_OF_TESTCASES
 };