diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/pub/skabus-pubd.c | 18 | ||||
-rw-r--r-- | src/rpc/skabus-rpcd.h | 6 | ||||
-rw-r--r-- | src/rpc/skabus_rpcd_client.c | 4 | ||||
-rw-r--r-- | src/rpc/skabus_rpcd_interface.c | 4 | ||||
-rw-r--r-- | src/rpc/skabus_rpcd_query.c | 6 |
5 files changed, 19 insertions, 19 deletions
diff --git a/src/pub/skabus-pubd.c b/src/pub/skabus-pubd.c index 6103206..46d03ea 100644 --- a/src/pub/skabus-pubd.c +++ b/src/pub/skabus-pubd.c @@ -310,10 +310,10 @@ static inline int client_flush (uint32_t i, iopause_fd const *x) if (error_isagain(errno)) isflushed = 0 ; else { - char what[2] = "-" ; + unsigned char what[2] = "-" ; what[1] = errno ; if (verbosity) strerr_warnwu2sys("unixmessage_sender_flush ", c->idstr) ; - if (!announce(what, 2, c->idstr)) dienomem() ; + if (!announce((char *)what, 2, c->idstr)) dienomem() ; return 0 ; } else isflushed = 1 ; @@ -325,10 +325,10 @@ static inline int client_flush (uint32_t i, iopause_fd const *x) if (error_isagain(errno)) isflushed = 0 ; else { - char what[2] = "-" ; + unsigned char what[2] = "-" ; what[1] = errno ; if (verbosity) strerr_warnwu2sys("unixmessage_sender_flush ", c->idstr) ; - if (!announce(what, 2, c->idstr)) dienomem() ; + if (!announce((char *)what, 2, c->idstr)) dienomem() ; return 0 ; } else isflushed = !!isflushed ; @@ -375,7 +375,7 @@ static int do_register (uint32_t cc, unixmessage const *m) avltreen_insert(clientmap, cc) ; if (!announce("+", 1, s)) { - char e = errno ; + unsigned char e = errno ; regfree(&c->write_re) ; regfree(&c->subscribe_re) ; avltreen_delete(clientmap, c->idstr) ; @@ -877,9 +877,9 @@ int main (int argc, char const *const *argv, char const *const *envp) for (j = sentinel, i = clientstorage[sentinel].next ; i != sentinel ; j = i, i = clientstorage[i].next) if (!tain_future(&clientstorage[i].deadline)) { - char what[2] = "-" ; + unsigned char what[2] = "-" ; what[1] = ETIMEDOUT ; - if (!announce(what, 2, CLIENT(i)->idstr)) dienomem() ; + if (!announce((char *)what, 2, CLIENT(i)->idstr)) dienomem() ; remove(&i, j) ; } continue ; @@ -898,9 +898,9 @@ int main (int argc, char const *const *argv, char const *const *envp) case -1 : case -2 : { - char what[2] = "-" ; + unsigned char what[2] = "-" ; what[1] = errno ; - if (!announce(what, 2, CLIENT(i)->idstr)) dienomem() ; + if (!announce((char *)what, 2, CLIENT(i)->idstr)) dienomem() ; } remove(&i, j) ; case 1 : break ; diff --git a/src/rpc/skabus-rpcd.h b/src/rpc/skabus-rpcd.h index e9b63fe..394c4c7 100644 --- a/src/rpc/skabus-rpcd.h +++ b/src/rpc/skabus-rpcd.h @@ -113,9 +113,9 @@ extern unsigned int sentinel ; #define numconn (genset_n(clients) - 1) extern void query_remove (uint32_t) ; -extern void query_fail (uint32_t, char) ; -extern int query_cancel (uint32_t, char) ; -extern int query_cancelremove (uint32_t, char) ; +extern void query_fail (uint32_t, unsigned char) ; +extern int query_cancel (uint32_t, unsigned char) ; +extern int query_cancelremove (uint32_t, unsigned char) ; extern int query_lookup_by_serial (uint64_t, uint32_t *) ; extern int query_lookup_by_mindeadline (uint32_t *) ; extern void query_get_mindeadline (tain *) ; diff --git a/src/rpc/skabus_rpcd_client.c b/src/rpc/skabus_rpcd_client.c index 198f0da..d5397e4 100644 --- a/src/rpc/skabus_rpcd_client.c +++ b/src/rpc/skabus_rpcd_client.c @@ -46,13 +46,13 @@ static inline void client_delete (uint32_t i, uint32_t prev) static int query_cancelremove_iter (char *s, void *reason) { uint32_t i = *(uint32_t *)s ; - return query_cancelremove(i, *(char *)reason) ; + return query_cancelremove(i, *(unsigned char *)reason) ; } void client_remove (uint32_t i, uint32_t prev) { client_t *c = CLIENT(i) ; - char reason = ECONNABORTED ; + unsigned char reason = ECONNABORTED ; if (gensetdyn_iter(&c->queries, &query_cancelremove_iter, &reason) < gensetdyn_n(&c->queries)) strerr_diefu1sys(111, "query_cancelremove_iter in client_remove") ; while (genalloc_len(uint32_t, &c->interfaces)) diff --git a/src/rpc/skabus_rpcd_interface.c b/src/rpc/skabus_rpcd_interface.c index bf5c7e0..ac9cf46 100644 --- a/src/rpc/skabus_rpcd_interface.c +++ b/src/rpc/skabus_rpcd_interface.c @@ -47,7 +47,7 @@ static inline void interface_delete (uint32_t i) static int query_fail_iter (char *s, void *reason) { uint32_t i = *(uint32_t *)s ; - query_fail(i, *(char *)reason) ; + query_fail(i, *(unsigned char *)reason) ; return 1 ; } @@ -63,7 +63,7 @@ void interface_remove (uint32_t i) interface_t *y = INTERFACE(i) ; client_t *c = CLIENT(y->client) ; uint32_t n = gensetdyn_n(&y->queries) ; - char reason = ECONNRESET ; + unsigned char reason = ECONNRESET ; gensetdyn_iter(&y->queries, &query_fail_iter, &reason) ; n = genalloc_len(uint32_t, &c->interfaces) ; client_interfacemove(c, n-1, y->index) ; diff --git a/src/rpc/skabus_rpcd_query.c b/src/rpc/skabus_rpcd_query.c index 13f3ebe..a9271c2 100644 --- a/src/rpc/skabus_rpcd_query.c +++ b/src/rpc/skabus_rpcd_query.c @@ -68,7 +68,7 @@ void query_remove (uint32_t i) query_delete(i) ; } -void query_fail (uint32_t i, char status) +void query_fail (uint32_t i, unsigned char status) { query_t *q = QUERY(i) ; client_t *c = CLIENT(q->client) ; @@ -82,7 +82,7 @@ void query_fail (uint32_t i, char status) client_setdeadline(c) ; } -int query_cancel (uint32_t i, char reason) +int query_cancel (uint32_t i, unsigned char reason) { query_t *q = QUERY(i) ; interface_t *y = INTERFACE(q->interface) ; @@ -97,7 +97,7 @@ int query_cancel (uint32_t i, char reason) return 1 ; } -int query_cancelremove (uint32_t i, char reason) +int query_cancelremove (uint32_t i, unsigned char reason) { if (!query_cancel(i, reason)) return 0 ; query_remove(i) ; |