libs/libbpmclient/*: change timeout from uint32_t to int

The timeout variable must support negative numbers, -1, meaning an infinite wait.

libs/libbpmclient/*: change timeout from uint32_t to int
The timeout variable must support negative numbers, -1, meaning an infinite wait.
127491c7 · Lucas Russo · e6833c94 · 127491c7 · 127491c7
Commit 127491c7 authored Oct 03, 2015 by Lucas Russo
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

bpm_client_core.h src/libs/libbpmclient/include/bpm_client_core.h +3 -3

bpm_client_core.c src/libs/libbpmclient/src/bpm_client_core.c +6 -6

No files found.
--- a/src/libs/libbpmclient/include/bpm_client_core.h
+++ b/src/libs/libbpmclient/include/bpm_client_core.h
@@ -32,7 +32,7 @@ bpm_client_t *bpm_client_new (char *broker_endp, int verbose,
 * server, specifying the send/recv timeout in ms.
 * Return an instance of the bpm client */
 bpm_client_t *bpm_client_new_time (char *broker_endp, int verbose,
-        const char *log_file_name, uint32_t timeout);
+        const char *log_file_name, int timeout);

 /* Create an instance of the BPM client, with the log filemode specified
 * by "log_mode" as in fopen () call. This must be called before any operation
@@ -46,7 +46,7 @@ bpm_client_t *bpm_client_new_log_mode (char *broker_endp, int verbose,
 * This must be called before any operation involving communicating with the
 * BPM server. Return an instance of the bpm client */
 bpm_client_t *bpm_client_new_log_mode_time (char *broker_endp, int verbose,
-        const char *log_file_name, const char *log_mode, uint32_t timeout);
+        const char *log_file_name, const char *log_mode, int timeout);

 /* Destroy an instance of the BPM client. This must be called
 * after all operations involving the communication with the BPM
@@ -74,7 +74,7 @@ mlm_client_t *bpm_get_mlm_client (bpm_client_t *self);
 zpoller_t *bpm_client_get_poller (bpm_client_t *self);

 /* Set the timeout paramter to send;recv functions */
-bpm_client_err_e bpm_client_set_timeout (bpm_client_t *self, uint32_t timeout);
+bpm_client_err_e bpm_client_set_timeout (bpm_client_t *self, int timeout);

 /* Get the timeout parameter */
 uint32_t bpm_client_get_timeout (bpm_client_t *self);

--- a/src/libs/libbpmclient/src/bpm_client_core.c
+++ b/src/libs/libbpmclient/src/bpm_client_core.c
@@ -44,13 +44,13 @@
 struct _bpm_client_t {
    zuuid_t * uuid;                             /* Client UUID */
    mlm_client_t *mlm_client;                   /* Malamute client instance */
-    uint32_t timeout;                           /* Timeout in msec for send/recv */
+    int timeout;                                /* Timeout in msec for send/recv */
    zpoller_t *poller;                          /* Poller for receiving messages */
    const acq_chan_t *acq_chan;                 /* Acquisition buffer table */
 };

 static bpm_client_t *_bpm_client_new (char *broker_endp, int verbose,
-        const char *log_file_name, const char *log_mode, uint32_t timeout);
+        const char *log_file_name, const char *log_mode, int timeout);
 static bpm_client_err_e _func_polling (bpm_client_t *self, char *name,
        char *service, uint32_t *input, uint32_t *output, int timeout);

@@ -108,14 +108,14 @@ bpm_client_t *bpm_client_new_log_mode (char *broker_endp, int verbose,
 }

 bpm_client_t *bpm_client_new_log_mode_time (char *broker_endp, int verbose,
-        const char *log_file_name, const char *log_mode, uint32_t timeout)
+        const char *log_file_name, const char *log_mode, int timeout)
 {
    return _bpm_client_new (broker_endp, verbose, log_file_name,
            log_mode, timeout);
 }

 bpm_client_t *bpm_client_new_time (char *broker_endp, int verbose,
-        const char *log_file_name, uint32_t timeout)
+        const char *log_file_name, int timeout)
 {
    return _bpm_client_new (broker_endp, verbose, log_file_name,
            BPMCLIENT_DFLT_LOG_MODE, timeout);
@@ -144,7 +144,7 @@ zpoller_t *bpm_client_get_poller (bpm_client_t *self)
    return self->poller;
 }

-bpm_client_err_e bpm_client_set_timeout (bpm_client_t *self, uint32_t timeout)
+bpm_client_err_e bpm_client_set_timeout (bpm_client_t *self, int timeout)
 {
    bpm_client_err_e err = BPM_CLIENT_SUCCESS;
    self->timeout = timeout;
@@ -158,7 +158,7 @@ uint32_t bpm_client_get_timeout (bpm_client_t *self)

 /**************** Static LIB Client Functions ****************/
 static bpm_client_t *_bpm_client_new (char *broker_endp, int verbose,
-        const char *log_file_name, const char *log_mode, uint32_t timeout)
+        const char *log_file_name, const char *log_mode, int timeout)
 {
    (void) verbose;