Unverified Commit ca927b7f authored by Ola Bini's avatar Ola Bini
Browse files

Fix spaces

parent be7ef94a

src/common/procmon.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

src/test/log_test_helpers.c

+6 −4
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ mock_saved_log_at(int 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
@@ -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);

src/test/log_test_helpers.h

+3 −1
Original line number Diff line number Diff line
@@ -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);

src/test/test_procmon.c

+8 −4
Original line number Diff line number Diff line
@@ -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

};