Commit 4f45ac13 authored by Luca Boccassi's avatar Luca Boccassi

Problem: formatting not up to date

Solution: run make clang-format-diff
parent 09476b3d
...@@ -263,7 +263,7 @@ typedef struct zmq_msg_t ...@@ -263,7 +263,7 @@ typedef struct zmq_msg_t
#endif #endif
} zmq_msg_t; } zmq_msg_t;
typedef void (zmq_free_fn) (void *data_, void *hint_); typedef void(zmq_free_fn) (void *data_, void *hint_);
ZMQ_EXPORT int zmq_msg_init (zmq_msg_t *msg_); ZMQ_EXPORT int zmq_msg_init (zmq_msg_t *msg_);
ZMQ_EXPORT int zmq_msg_init_size (zmq_msg_t *msg_, size_t size_); ZMQ_EXPORT int zmq_msg_init_size (zmq_msg_t *msg_, size_t size_);
...@@ -597,7 +597,7 @@ ZMQ_EXPORT void zmq_atomic_counter_destroy (void **counter_p_); ...@@ -597,7 +597,7 @@ ZMQ_EXPORT void zmq_atomic_counter_destroy (void **counter_p_);
#define ZMQ_HAVE_TIMERS #define ZMQ_HAVE_TIMERS
typedef void (zmq_timer_fn) (int timer_id, void *arg); typedef void(zmq_timer_fn) (int timer_id, void *arg);
ZMQ_EXPORT void *zmq_timers_new (void); ZMQ_EXPORT void *zmq_timers_new (void);
ZMQ_EXPORT int zmq_timers_destroy (void **timers_p); ZMQ_EXPORT int zmq_timers_destroy (void **timers_p);
...@@ -634,7 +634,7 @@ ZMQ_EXPORT unsigned long zmq_stopwatch_stop (void *watch_); ...@@ -634,7 +634,7 @@ ZMQ_EXPORT unsigned long zmq_stopwatch_stop (void *watch_);
/* Sleeps for specified number of seconds. */ /* Sleeps for specified number of seconds. */
ZMQ_EXPORT void zmq_sleep (int seconds_); ZMQ_EXPORT void zmq_sleep (int seconds_);
typedef void (zmq_thread_fn) (void *); typedef void(zmq_thread_fn) (void *);
/* Start a thread. Returns a handle to the thread. */ /* Start a thread. Returns a handle to the thread. */
ZMQ_EXPORT void *zmq_threadstart (zmq_thread_fn *func_, void *arg_); ZMQ_EXPORT void *zmq_threadstart (zmq_thread_fn *func_, void *arg_);
......
...@@ -77,9 +77,12 @@ ...@@ -77,9 +77,12 @@
// This macro is used to avoid-variable warning. If used with an expression, // This macro is used to avoid-variable warning. If used with an expression,
// the sizeof is not evaluated to avoid polluting the assembly code. // the sizeof is not evaluated to avoid polluting the assembly code.
#ifdef NDEBUG #ifdef NDEBUG
#define ASSERT_EXPR_SAFE(x) do { (void)sizeof(x);} while (0) #define ASSERT_EXPR_SAFE(x) \
do { \
(void) sizeof (x); \
} while (0)
#else #else
#define ASSERT_EXPR_SAFE(x) assert(x) #define ASSERT_EXPR_SAFE(x) assert (x)
#endif #endif
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
// Note that it has to be declared as "C" so that it is the same as // Note that it has to be declared as "C" so that it is the same as
// zmq_free_fn defined in zmq.h. // zmq_free_fn defined in zmq.h.
extern "C" { extern "C" {
typedef void (msg_free_fn) (void *data_, void *hint_); typedef void(msg_free_fn) (void *data_, void *hint_);
} }
namespace zmq namespace zmq
......
File mode changed from 100755 to 100644
...@@ -202,7 +202,7 @@ void reconnect_stop_on_refused () ...@@ -202,7 +202,7 @@ void reconnect_stop_on_refused ()
2 * 1000); 2 * 1000);
int limit = 0; int limit = 0;
while ((rc != -1) && (++limit < 1000)) { while ((rc != -1) && (++limit < 1000)) {
print_unexpected_event_stderr(event, rc, 0, -1); print_unexpected_event_stderr (event, rc, 0, -1);
rc = get_monitor_event_with_timeout (sub_mon, &event, &event_address, rc = get_monitor_event_with_timeout (sub_mon, &event, &event_address,
2 * 1000); 2 * 1000);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment