From c7629d930ba07e9e8ed76b0e4d13c4ad2d753f0f Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Thu, 9 Aug 2012 15:30:41 +0000 Subject: [PATCH] patch: remove usage of strerror(), use %m instead --- src/bfcp/sock.c | 3 +-- src/dns/client.c | 2 +- src/dns/ns.c | 4 +--- src/dns/win32/srv.c | 5 ++-- src/fmt/print.c | 4 ++-- src/ice/candpair.c | 2 +- src/ice/connchk.c | 10 ++++---- src/ice/gather.c | 9 ++++--- src/ice/stunsrv.c | 7 +++--- src/lock/lock.c | 9 ++++--- src/lock/rwlock.c | 9 ++++--- src/main/epoll.c | 3 +-- src/main/main.c | 24 +++++++++---------- src/mbuf/mbuf.c | 2 +- src/mod/mod.c | 2 +- src/natbd/filtering.c | 11 ++++----- src/natbd/genalg.c | 4 +--- src/natbd/hairpinning.c | 10 ++++---- src/natbd/lifetime.c | 8 +++---- src/natbd/mapping.c | 19 ++++++--------- src/net/ifaddrs.c | 3 +-- src/net/linux/rt.c | 10 ++++---- src/net/posix/pif.c | 9 +++---- src/net/sock.c | 4 +--- src/net/sockopt.c | 16 ++++++------- src/rtp/sess.c | 2 +- src/sdp/msg.c | 4 +--- src/sip/transp.c | 3 +-- src/sipevent/listen.c | 11 +++++---- src/sipsess/listen.c | 4 ++-- src/stun/dnsdisc.c | 11 ++++----- src/tcp/symbian/tcp.cpp | 5 ++-- src/tcp/tcp.c | 53 ++++++++++++++++------------------------- src/tmr/tmr.c | 3 +-- src/udp/udp.c | 8 +++---- 35 files changed, 121 insertions(+), 172 deletions(-) diff --git a/src/bfcp/sock.c b/src/bfcp/sock.c index ef7be6e..5ca29ad 100644 --- a/src/bfcp/sock.c +++ b/src/bfcp/sock.c @@ -3,7 +3,6 @@ * * Copyright (C) 2010 Creytiv.com */ -#include #include #include #include @@ -162,7 +161,7 @@ static void tcp_close_handler(int err, void *arg) { struct bfcp_conn *conn = arg; - (void)re_printf("BFCP connection closed: %s\n", strerror(err)); + (void)re_printf("BFCP connection closed: %m\n", err); mem_deref(conn); } diff --git a/src/dns/client.c b/src/dns/client.c index b4a2ec6..2662a28 100644 --- a/src/dns/client.c +++ b/src/dns/client.c @@ -403,7 +403,7 @@ static void tcp_close_handler(int err, void *arg) { struct tcpconn *tc = arg; - DEBUG_NOTICE("connection (%J) closed: %s\n", &tc->srv, strerror(err)); + DEBUG_NOTICE("connection (%J) closed: %m\n", &tc->srv, err); tcpconn_close(tc, err); } diff --git a/src/dns/ns.c b/src/dns/ns.c index 0980a4a..182c3a9 100644 --- a/src/dns/ns.c +++ b/src/dns/ns.c @@ -4,7 +4,6 @@ * Copyright (C) 2010 Creytiv.com */ #include -#include #include #include #include @@ -68,8 +67,7 @@ static int parse_resolv_conf(char *domain, size_t dsize, &srv)) { err = sa_set(&srvv[i], &srv, DNS_PORT); if (err) { - DEBUG_WARNING("sa_set: %r (%s)\n", - &srv, strerror(err)); + DEBUG_WARNING("sa_set: %r (%m)\n", &srv, err); } ++i; } diff --git a/src/dns/win32/srv.c b/src/dns/win32/srv.c index af957f3..0ca0749 100644 --- a/src/dns/win32/srv.c +++ b/src/dns/win32/srv.c @@ -77,9 +77,8 @@ int get_windns(char *domain, size_t dsize, struct sa *srvv, uint32_t *n) err = sa_set_str(&srvv[i], pIPAddr->IpAddress.String, DNS_PORT); if (err) { - DEBUG_WARNING("sa_set_str: %s (%s)\n", - pIPAddr->IpAddress.String, - strerror(err)); + DEBUG_WARNING("sa_set_str: %s (%m)\n", + pIPAddr->IpAddress.String, err); } DEBUG_INFO("dns ip %u: %j\n", i, &srvv[i]); ++i; diff --git a/src/fmt/print.c b/src/fmt/print.c index a7936e7..cbcc33d 100644 --- a/src/fmt/print.c +++ b/src/fmt/print.c @@ -159,7 +159,7 @@ static size_t local_ftoa(char *buf, double n, size_t dp) int re_vhprintf(const char *fmt, va_list ap, re_vprintf_h *vph, void *arg) { uint8_t base, *bptr; - char pch, ch, num[NUM_SIZE], addr[64]; + char pch, ch, num[NUM_SIZE], addr[64], msg[256]; enum length_modifier lenmod = LENMOD_NONE; struct re_printf pf; bool fm = false, plr = false; @@ -313,7 +313,7 @@ int re_vhprintf(const char *fmt, va_list ap, re_vprintf_h *vph, void *arg) break; case 'm': - str = str_error(va_arg(ap, int), addr, sizeof(addr)); + str = str_error(va_arg(ap, int), msg, sizeof(msg)); err |= write_padded(str, str_len(str), pad, ' ', plr, NULL, vph, arg); break; diff --git a/src/ice/candpair.c b/src/ice/candpair.c index a80ea00..415cbac 100644 --- a/src/ice/candpair.c +++ b/src/ice/candpair.c @@ -386,7 +386,7 @@ int icem_candpair_debug(struct re_printf *pf, const struct candpair *cp) err |= re_hprintf(pf, " ERTT = %.2fms", cp->ertt / 1000.0); if (cp->err) - err |= re_hprintf(pf, " (%s)", strerror(cp->err)); + err |= re_hprintf(pf, " (%m)", cp->err); if (cp->scode) err |= re_hprintf(pf, " [%u]", cp->scode); diff --git a/src/ice/connchk.c b/src/ice/connchk.c index 691a5e8..d7c6610 100644 --- a/src/ice/connchk.c +++ b/src/ice/connchk.c @@ -3,7 +3,6 @@ * * Copyright (C) 2010 Creytiv.com */ -#include #include #include #include @@ -127,8 +126,7 @@ static void handle_success(struct icem *icem, struct candpair *cp, err = icem_lcand_add(icem, cp->lcand, CAND_TYPE_PRFLX, addr); if (err) { - DEBUG_WARNING("failed to add PRFLX: %s\n", - strerror(err)); + DEBUG_WARNING("failed to add PRFLX: %m\n", err); } } @@ -158,10 +156,10 @@ static void stunc_resp_handler(int err, uint16_t scode, const char *reason, (void)reason; #if ICE_TRACE - icecomp_printf(cp->comp, "Rx %H <--- %H '%u %s' (%s)\n", + icecomp_printf(cp->comp, "Rx %H <--- %H '%u %s' (%m)\n", icem_cand_print, cp->lcand, icem_cand_print, cp->rcand, - scode, reason, err ? strerror(err) : ""); + scode, reason, err); #endif if (err) { @@ -267,7 +265,7 @@ int icem_conncheck_send(struct candpair *cp, bool use_cand, bool trigged) err = turnc_add_chan(cp->comp->turnc, &cp->rcand->addr, NULL, NULL); if (err) { - DEBUG_WARNING("add channel: %s\n", strerror(err)); + DEBUG_WARNING("add channel: %m\n", err); break; } presz = 4; diff --git a/src/ice/gather.c b/src/ice/gather.c index 14d7526..3cceb9a 100644 --- a/src/ice/gather.c +++ b/src/ice/gather.c @@ -3,7 +3,6 @@ * * Copyright (C) 2010 Creytiv.com */ -#include #include #include #include @@ -64,8 +63,8 @@ static void stun_resp_handler(int err, uint16_t scode, const char *reason, --icem->nstun; if (err || scode > 0) { - DEBUG_WARNING("{%s.%u} STUN Request failed: %s\n", - icem->name, comp->id, strerror(err)); + DEBUG_WARNING("{%s.%u} STUN Request failed: %m\n", + icem->name, comp->id, err); goto out; } @@ -129,8 +128,8 @@ static void turnc_handler(int err, uint16_t scode, const char *reason, } if (err) { - DEBUG_WARNING("{%s.%u} TURN Client error: %s\n", - icem->name, comp->id, strerror(err)); + DEBUG_WARNING("{%s.%u} TURN Client error: %m\n", + icem->name, comp->id, err); goto out; } diff --git a/src/ice/stunsrv.c b/src/ice/stunsrv.c index 6c0c257..19ad809 100644 --- a/src/ice/stunsrv.c +++ b/src/ice/stunsrv.c @@ -76,8 +76,8 @@ static void triggered_check(struct icem *icem, struct cand *lcand, err = icem_candpair_alloc(&cp, icem, lcand, rcand); if (err) { DEBUG_WARNING("failed to allocate candpair:" - " lcand=%p rcand=%p (%s)\n", - lcand, rcand, strerror(err)); + " lcand=%p rcand=%p (%m)\n", + lcand, rcand, err); return; } @@ -159,8 +159,7 @@ static void handle_stun(struct ice *ice, struct icem *icem, err = icem_rcand_add_prflx(&rcand, icem, comp->id, prio, src); if (err) { - DEBUG_WARNING("icem_rcand_add_prflx: %s\n", - strerror(err)); + DEBUG_WARNING("icem_rcand_add_prflx: %m\n", err); return; } } diff --git a/src/lock/lock.c b/src/lock/lock.c index 81b427f..fd50c40 100644 --- a/src/lock/lock.c +++ b/src/lock/lock.c @@ -3,7 +3,6 @@ * * Copyright (C) 2010 Creytiv.com */ -#include #define __USE_UNIX98 1 #include #include @@ -33,7 +32,7 @@ static void lock_destructor(void *data) int err = pthread_mutex_destroy(&l->m); if (err) { - DEBUG_WARNING("pthread_mutex_destroy: %s\n", strerror(err)); + DEBUG_WARNING("pthread_mutex_destroy: %m\n", err); } } @@ -83,7 +82,7 @@ void lock_read_get(struct lock *l) { const int err = pthread_mutex_lock(&l->m); if (err) { - DEBUG_WARNING("lock_read_get: %s\n", strerror(err)); + DEBUG_WARNING("lock_read_get: %m\n", err); } } @@ -97,7 +96,7 @@ void lock_write_get(struct lock *l) { const int err = pthread_mutex_lock(&l->m); if (err) { - DEBUG_WARNING("lock_write_get: %s\n", strerror(err)); + DEBUG_WARNING("lock_write_get: %m\n", err); } } @@ -137,6 +136,6 @@ void lock_rel(struct lock *l) { const int err = pthread_mutex_unlock(&l->m); if (err) { - DEBUG_WARNING("lock_rel: %s\n", strerror(err)); + DEBUG_WARNING("lock_rel: %m\n", err); } } diff --git a/src/lock/rwlock.c b/src/lock/rwlock.c index 135a9c0..0f6605f 100644 --- a/src/lock/rwlock.c +++ b/src/lock/rwlock.c @@ -5,7 +5,6 @@ */ #define _GNU_SOURCE 1 #include -#include #include #include #include @@ -27,7 +26,7 @@ static void lock_destructor(void *data) int err = pthread_rwlock_destroy(&l->lock); if (err) { - DEBUG_WARNING("pthread_rwlock_destroy: %s\n", strerror(err)); + DEBUG_WARNING("pthread_rwlock_destroy: %m\n", err); } } @@ -66,7 +65,7 @@ void lock_read_get(struct lock *l) err = pthread_rwlock_rdlock(&l->lock); if (err) { - DEBUG_WARNING("lock_read_get: %s\n", strerror(err)); + DEBUG_WARNING("lock_read_get: %m\n", err); } } @@ -80,7 +79,7 @@ void lock_write_get(struct lock *l) err = pthread_rwlock_wrlock(&l->lock); if (err) { - DEBUG_WARNING("lock_write_get: %s\n", strerror(err)); + DEBUG_WARNING("lock_write_get: %m\n", err); } } @@ -110,6 +109,6 @@ void lock_rel(struct lock *l) err = pthread_rwlock_unlock(&l->lock); if (err) { - DEBUG_WARNING("lock_rel: %s\n", strerror(err)); + DEBUG_WARNING("lock_rel: %m\n", err); } } diff --git a/src/main/epoll.c b/src/main/epoll.c index 0479869..dfe91fe 100644 --- a/src/main/epoll.c +++ b/src/main/epoll.c @@ -3,7 +3,6 @@ * * Copyright (C) 2010 Creytiv.com */ -#include #include #include #include @@ -46,7 +45,7 @@ bool epoll_check(void) epfd = epoll_create(64); if (-1 == epfd) { - DEBUG_NOTICE("epoll_create: %s\n", strerror(errno)); + DEBUG_NOTICE("epoll_create: %m\n", errno); return false; } diff --git a/src/main/main.c b/src/main/main.c index 31a2000..3f28ebe 100644 --- a/src/main/main.c +++ b/src/main/main.c @@ -180,7 +180,7 @@ static inline void re_lock(struct re *re) err = pthread_mutex_lock(&re->mutex); if (err) { - DEBUG_WARNING("re_lock: %s\n", strerror(err)); + DEBUG_WARNING("re_lock: %m\n", err); } } @@ -191,7 +191,7 @@ static inline void re_unlock(struct re *re) err = pthread_mutex_unlock(&re->mutex); if (err) { - DEBUG_WARNING("re_unlock: %s\n", strerror(err)); + DEBUG_WARNING("re_unlock: %m\n", err); } } @@ -295,23 +295,23 @@ static int set_epoll_fds(struct re *re, int fd, int flags) err = errno; DEBUG_WARNING("epoll_ctl:" " EPOLL_CTL_MOD:" - " fd=%d (%s)\n", - fd, strerror(err)); + " fd=%d (%m)\n", + fd, err); } } else { err = errno; DEBUG_WARNING("epoll_ctl: EPOLL_CTL_ADD:" - " fd=%d (%s)\n", - fd, strerror(err)); + " fd=%d (%m)\n", + fd, err); } } } else { if (-1 == epoll_ctl(re->epfd, EPOLL_CTL_DEL, fd, &event)) { err = errno; - DEBUG_INFO("epoll_ctl: EPOLL_CTL_DEL: fd=%d (%s)\n", - fd, strerror(err)); + DEBUG_INFO("epoll_ctl: EPOLL_CTL_DEL: fd=%d (%m)\n", + fd, err); } } @@ -390,8 +390,8 @@ static int poll_init(struct re *re) if (re->epfd <= 0 && -1 == (re->epfd = epoll_create(re->maxfds))) { - DEBUG_WARNING("epoll_create: %s (maxfds=%d)\n", - strerror(errno), re->maxfds); + DEBUG_WARNING("epoll_create: %m (maxfds=%d)\n", + errno, re->maxfds); return errno; } DEBUG_INFO("init: epoll_create() epfd=%d\n", re->epfd); @@ -523,8 +523,8 @@ int fd_listen(int fd, int flags, fd_h *fh, void *arg) if (err) { if (flags && fh) { fd_close(fd); - DEBUG_WARNING("fd_listen: fd=%d flags=0x%02x (%s)\n", - fd, flags, strerror(err)); + DEBUG_WARNING("fd_listen: fd=%d flags=0x%02x (%m)\n", + fd, flags, err); } } diff --git a/src/mbuf/mbuf.c b/src/mbuf/mbuf.c index 5b0542b..e8f73fc 100644 --- a/src/mbuf/mbuf.c +++ b/src/mbuf/mbuf.c @@ -148,7 +148,7 @@ void mbuf_trim(struct mbuf *mb) /* We shrink - this cannot fail */ err = mbuf_resize(mb, mb->end); if (err) { - DEBUG_WARNING("trim: resize failed (%s)\n", strerror(err)); + DEBUG_WARNING("trim: resize failed (%m)\n", err); } } diff --git a/src/mod/mod.c b/src/mod/mod.c index a2764ef..6dea686 100644 --- a/src/mod/mod.c +++ b/src/mod/mod.c @@ -55,7 +55,7 @@ static void mod_destructor(void *data) int err; if (me && me->close && (err = me->close())) { - DEBUG_NOTICE("close: error (%s)\n", strerror(err)); + DEBUG_NOTICE("close: error (%m)\n", err); } list_unlink(&m->le); diff --git a/src/natbd/filtering.c b/src/natbd/filtering.c index aacb0d8..8d0acc5 100644 --- a/src/natbd/filtering.c +++ b/src/natbd/filtering.c @@ -3,7 +3,6 @@ * * Copyright (C) 2010 Creytiv.com */ -#include #include #include #include @@ -82,8 +81,8 @@ static void stun_response_handler(int err, uint16_t scode, const char *reason, /* Test I completed */ if (err || scode) { - DEBUG_WARNING("Test I: stun_response_handler: %s\n", - strerror(err)); + DEBUG_WARNING("Test I: stun_response_handler: %m\n", + err); nf->fh(err, NAT_TYPE_UNKNOWN, nf->arg); return; } @@ -107,8 +106,7 @@ static void stun_response_handler(int err, uint16_t scode, const char *reason, STUN_ATTR_SOFTWARE, stun_software, STUN_ATTR_CHANGE_REQ, &change_req); if (err) { - DEBUG_WARNING("stunc_request_send: (%s)\n", - strerror(err)); + DEBUG_WARNING("stunc_request_send: (%m)\n", err); nf->fh(err, NAT_TYPE_UNKNOWN, nf->arg); } break; @@ -146,8 +144,7 @@ static void stun_response_handler(int err, uint16_t scode, const char *reason, STUN_ATTR_SOFTWARE, stun_software, STUN_ATTR_CHANGE_REQ, &change_req); if (err) { - DEBUG_WARNING("stunc_request_send: (%s)\n", - strerror(err)); + DEBUG_WARNING("stunc_request_send: (%m)\n", err); nf->fh(err, NAT_TYPE_UNKNOWN, nf->arg); } break; diff --git a/src/natbd/genalg.c b/src/natbd/genalg.c index 0f14090..9a2e617 100644 --- a/src/natbd/genalg.c +++ b/src/natbd/genalg.c @@ -3,7 +3,6 @@ * * Copyright (C) 2010 Creytiv.com */ -#include #include #include #include @@ -149,8 +148,7 @@ int nat_genalg_start(struct nat_genalg *ng) stun_response_handler, ng, 1, STUN_ATTR_SOFTWARE, stun_software); if (err) { - DEBUG_WARNING("start: stunc_request_send(): (%s)\n", - strerror(err)); + DEBUG_WARNING("start: stunc_request_send(): (%m)\n", err); } return err; diff --git a/src/natbd/hairpinning.c b/src/natbd/hairpinning.c index 5e4d40f..396d50e 100644 --- a/src/natbd/hairpinning.c +++ b/src/natbd/hairpinning.c @@ -3,7 +3,6 @@ * * Copyright (C) 2010 Creytiv.com */ -#include #include #include #include @@ -174,7 +173,7 @@ static void stun_response_handler(int err, uint16_t scode, const char *reason, /* Send hairpinning test message */ err = hairpin_send(nh, &attr->v.sa); if (err) { - DEBUG_WARNING("hairpin_send: (%s)\n", strerror(err)); + DEBUG_WARNING("hairpin_send: (%m)\n", err); } if (err) @@ -202,7 +201,7 @@ static void tcp_conn_handler(const struct sa *peer, void *arg) err = tcp_accept(&nh->tc2, nh->ts, NULL, tcp_recv_handler2, tcp_close_handler2, nh); if (err) { - DEBUG_WARNING("TCP conn: tcp_accept: %s\n", strerror(err)); + DEBUG_WARNING("TCP conn: tcp_accept: %m\n", err); } } @@ -218,8 +217,7 @@ static void tcp_estab_handler(void *arg) err = mapped_send(nh); if (err) { - DEBUG_WARNING("TCP established: mapped_send (%s)\n", - strerror(err)); + DEBUG_WARNING("TCP established: mapped_send (%m)\n", err); nh->hph(err, false, nh->arg); } } @@ -232,7 +230,7 @@ static void tcp_recv_handler(struct mbuf *mb, void *arg) err = stun_recv(nh->stun, mb); if (err && ENOENT != err) { - DEBUG_WARNING("stun recv: %s\n", strerror(err)); + DEBUG_WARNING("stun recv: %m\n", err); } } diff --git a/src/natbd/lifetime.c b/src/natbd/lifetime.c index 9dc6065..0bbffb9 100644 --- a/src/natbd/lifetime.c +++ b/src/natbd/lifetime.c @@ -3,7 +3,6 @@ * * Copyright (C) 2010 Creytiv.com */ -#include #include #include #include @@ -67,8 +66,7 @@ static void msg_recv(struct stun *stun, const struct sa *src, err = stun_recv(stun, mb); if (err && ENOENT != err) { - DEBUG_WARNING("msg_recv: stunc_recv(): (%s)\n", - strerror(err)); + DEBUG_WARNING("msg_recv: stunc_recv(): (%m)\n", err); } } @@ -93,7 +91,7 @@ static void stun_response_handler_x(int err, uint16_t scode, (void)reason; if (err) { - DEBUG_WARNING("stun_response_handler X: %s\n", strerror(err)); + DEBUG_WARNING("stun_response_handler X: %m\n", err); goto out; } @@ -211,7 +209,7 @@ static void timeout(void *arg) return; out: - DEBUG_WARNING("timeout: (%s)\n", strerror(err)); + DEBUG_WARNING("timeout: (%m)\n", err); nl->lh(err, &nl->interval, nl->arg); diff --git a/src/natbd/mapping.c b/src/natbd/mapping.c index 105ed54..e304560 100644 --- a/src/natbd/mapping.c +++ b/src/natbd/mapping.c @@ -3,7 +3,6 @@ * * Copyright (C) 2010 Creytiv.com */ -#include #include #include #include @@ -70,7 +69,7 @@ static void stun_response_handler(int err, uint16_t scode, const char *reason, struct stun_attr *map, *other; if (err) { - DEBUG_WARNING("stun_response_handler: (%s)\n", strerror(err)); + DEBUG_WARNING("stun_response_handler: (%m)\n", err); nm->mh(err, NAT_TYPE_UNKNOWN, nm->arg); return; } @@ -118,8 +117,7 @@ static void stun_response_handler(int err, uint16_t scode, const char *reason, err = mapping_send(nm); if (err) { - DEBUG_WARNING("stunc_request_send: (%s)\n", - strerror(err)); + DEBUG_WARNING("stunc_request_send: (%m)\n", err); nm->mh(err, NAT_TYPE_UNKNOWN, nm->arg); } break; @@ -138,8 +136,7 @@ static void stun_response_handler(int err, uint16_t scode, const char *reason, sa_set_port(&nm->srv, sa_port(&other->v.other_addr)); err = mapping_send(nm); if (err) { - DEBUG_WARNING("stunc_request_send: (%s)\n", - strerror(err)); + DEBUG_WARNING("stunc_request_send: (%m)\n", err); nm->mh(err, NAT_TYPE_UNKNOWN, nm->arg); } break; @@ -193,8 +190,7 @@ static void udp_recv_handler(const struct sa *src, struct mbuf *mb, err = stun_recv(nm->stun, mb); if (err && ENOENT != err) { - DEBUG_WARNING("udp_recv_handler: stunc_recv(): (%s)\n", - strerror(err)); + DEBUG_WARNING("udp_recv_handler: stunc_recv(): (%m)\n", err); } } @@ -225,8 +221,7 @@ static void tcp_estab_handler(void *arg) STUN_ATTR_SOFTWARE, stun_software); if (err) { - DEBUG_WARNING("TCP established: mapping_send (%s)\n", - strerror(err)); + DEBUG_WARNING("TCP established: mapping_send (%m)\n", err); nm->mh(err, NAT_TYPE_UNKNOWN, nm->arg); } } @@ -239,7 +234,7 @@ static void tcp_recv_handler(struct mbuf *mb, void *arg) err = stun_recv(nm->stun, mb); if (err && ENOENT != err) { - DEBUG_WARNING("stunc recv: %s\n", strerror(err)); + DEBUG_WARNING("stunc recv: %m\n", err); } } @@ -248,7 +243,7 @@ static void tcp_close_handler(int err, void *arg) { struct nat_mapping *nm = arg; - DEBUG_NOTICE("TCP Connection Closed (%s)\n", strerror(err)); + DEBUG_NOTICE("TCP Connection Closed (%m)\n", err); if (err) { nm->mh(err, NAT_TYPE_UNKNOWN, nm->arg); diff --git a/src/net/ifaddrs.c b/src/net/ifaddrs.c index 5aa19a9..e175689 100644 --- a/src/net/ifaddrs.c +++ b/src/net/ifaddrs.c @@ -3,7 +3,6 @@ * * Copyright (C) 2010 Creytiv.com */ -#include #include #include #define __USE_MISC 1 /**< Use MISC code */ @@ -38,7 +37,7 @@ int net_getifaddrs(net_ifaddr_h *ifh, void *arg) return EINVAL; if (0 != getifaddrs(&ifa)) { - DEBUG_WARNING("getifaddrs: %s\n", strerror(errno)); + DEBUG_WARNING("getifaddrs: %m\n", errno); return errno; } diff --git a/src/net/linux/rt.c b/src/net/linux/rt.c index d48fa77..7e03587 100644 --- a/src/net/linux/rt.c +++ b/src/net/linux/rt.c @@ -57,7 +57,7 @@ static int read_sock(int fd, uint8_t *buf, size_t size, int seq, int pid) do { /* Receive response from the kernel */ if ((n = recv(fd, buf, size - len, 0)) < 0) { - DEBUG_WARNING("SOCK READ: %s\n", strerror(errno)); + DEBUG_WARNING("SOCK READ: %m\n", errno); return -1; } nlhdr = (struct nlmsghdr *)(void *)buf; @@ -196,7 +196,7 @@ int net_rt_list(net_rt_h *rth, void *arg) /* Create Socket */ if ((sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE)) < 0) { - DEBUG_WARNING("list: socket(): (%s)\n", strerror(errno)); + DEBUG_WARNING("list: socket(): (%m)\n", errno); return errno; } @@ -216,16 +216,14 @@ int net_rt_list(net_rt_h *rth, void *arg) /* Send the request */ if (send(sock, nlmsg, nlmsg->nlmsg_len, 0) < 0) { err = errno; - DEBUG_WARNING("list: write to socket failed (%s)\n", - strerror(err)); + DEBUG_WARNING("list: write to socket failed (%m)\n", err); goto out; } /* Read the response */ if ((len = read_sock(sock, u.buf, sizeof(u.buf), seq, getpid())) < 0) { err = errno; - DEBUG_WARNING("list: read from socket failed (%s)\n", - strerror(err)); + DEBUG_WARNING("list: read from socket failed (%m)\n", err); goto out; } diff --git a/src/net/posix/pif.c b/src/net/posix/pif.c index d628d66..0720d79 100644 --- a/src/net/posix/pif.c +++ b/src/net/posix/pif.c @@ -107,8 +107,7 @@ int net_if_list(net_ifaddr_h *ifh, void *arg) if (0 > (sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP))) { err = errno; - DEBUG_WARNING("interface list: socket(): (%s)\n", - strerror(err)); + DEBUG_WARNING("interface list: socket(): (%m)\n", err); goto out; } @@ -117,8 +116,7 @@ int net_if_list(net_ifaddr_h *ifh, void *arg) if (0 != ioctl(sockfd, SIOCGIFCONF, &ifc)) { err = errno; - DEBUG_WARNING("interface list: ioctl SIOCFIFCONF: %s\n", - strerror(err)); + DEBUG_WARNING("interface list: ioctl SIOCFIFCONF: %m\n", err); goto out; } @@ -152,8 +150,7 @@ int net_if_list(net_ifaddr_h *ifh, void *arg) err = sa_set_sa(&sa, &ifrr.ifr_ifru.ifru_addr); if (err) { - DEBUG_WARNING("if_list: sa_set_sa %s\n", - strerror(err)); + DEBUG_WARNING("if_list: sa_set_sa %m\n", err); break; } diff --git a/src/net/sock.c b/src/net/sock.c index 2958cea..7b74dee 100644 --- a/src/net/sock.c +++ b/src/net/sock.c @@ -3,7 +3,6 @@ * * Copyright (C) 2010 Creytiv.com */ -#include #include #include #include @@ -27,8 +26,7 @@ static int wsa_init(void) err = WSAStartup(wVersionRequested, &wsaData); if (err != 0) { - DEBUG_WARNING("Could not load winsock (%s)\n", - strerror(err)); + DEBUG_WARNING("Could not load winsock (%m)\n", err); return err; } diff --git a/src/net/sockopt.c b/src/net/sockopt.c index 7fa4076..b0d092c 100644 --- a/src/net/sockopt.c +++ b/src/net/sockopt.c @@ -3,7 +3,6 @@ * * Copyright (C) 2010 Creytiv.com */ -#include #ifdef HAVE_UNISTD_H #include #endif @@ -44,8 +43,8 @@ int net_sockopt_blocking_set(int fd, bool blocking) if (0 != ioctlsocket(fd, FIONBIO, &noblock)) { err = WSAGetLastError(); - DEBUG_WARNING("nonblock set: fd=%d err=%d (%s)\n", - fd, err, strerror(err)); + DEBUG_WARNING("nonblock set: fd=%d err=%d (%m)\n", + fd, err, err); } return err; #else @@ -55,8 +54,7 @@ int net_sockopt_blocking_set(int fd, bool blocking) flags = fcntl(fd, F_GETFL); if (-1 == flags) { err = errno; - DEBUG_WARNING("sockopt set: fnctl F_GETFL: (%s)\n", - strerror(err)); + DEBUG_WARNING("sockopt set: fnctl F_GETFL: (%m)\n", err); goto out; } @@ -67,8 +65,8 @@ int net_sockopt_blocking_set(int fd, bool blocking) if (-1 == fcntl(fd, F_SETFL, flags)) { err = errno; - DEBUG_WARNING("sockopt set: fcntl F_SETFL non-block (%s)\n", - strerror(err)); + DEBUG_WARNING("sockopt set: fcntl F_SETFL non-block (%m)\n", + err); } out: @@ -92,7 +90,7 @@ int net_sockopt_reuse_set(int fd, bool reuse) #ifdef SO_REUSEADDR if (-1 == setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, BUF_CAST &r, sizeof(r))) { - DEBUG_WARNING("SO_REUSEADDR: %s\n", strerror(errno)); + DEBUG_WARNING("SO_REUSEADDR: %m\n", errno); return errno; } #endif @@ -100,7 +98,7 @@ int net_sockopt_reuse_set(int fd, bool reuse) #ifdef SO_REUSEPORT if (-1 == setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, BUF_CAST &r, sizeof(r))) { - DEBUG_WARNING("SO_REUSEPORT: %s\n", strerror(errno)); + DEBUG_WARNING("SO_REUSEPORT: %m\n", errno); return errno; } #endif diff --git a/src/rtp/sess.c b/src/rtp/sess.c index ba6ec33..94446fb 100644 --- a/src/rtp/sess.c +++ b/src/rtp/sess.c @@ -495,7 +495,7 @@ static void timeout(void *arg) err = send_rtcp_report(sess); if (err) { - DEBUG_WARNING("Send RTCP report failed: %s\n", strerror(err)); + DEBUG_WARNING("Send RTCP report failed: %m\n", err); } schedule(sess); diff --git a/src/sdp/msg.c b/src/sdp/msg.c index 2407ff1..0bcde9c 100644 --- a/src/sdp/msg.c +++ b/src/sdp/msg.c @@ -3,7 +3,6 @@ * * Copyright (C) 2010 Creytiv.com */ -#include #include #include #include @@ -299,8 +298,7 @@ int sdp_decode(struct sdp_session *sess, struct mbuf *mb, bool offer) #if 0 if (err) - re_printf("*** %c='%r': %s\n", type, &val, - strerror(err)); + re_printf("** %c='%r': %m\n", type, &val, err); #endif type = 0; diff --git a/src/sip/transp.c b/src/sip/transp.c index 89470db..610c7a6 100644 --- a/src/sip/transp.c +++ b/src/sip/transp.c @@ -305,8 +305,7 @@ static void udp_recv_handler(const struct sa *src, struct mbuf *mb, void *arg) err = sip_msg_decode(&msg, mb); if (err) { - (void)re_fprintf(stderr, "sip: msg decode err: %s\n", - strerror(err)); + (void)re_fprintf(stderr, "sip: msg decode err: %m\n", err); return; } diff --git a/src/sipevent/listen.c b/src/sipevent/listen.c index 9e05126..b4eb29a 100644 --- a/src/sipevent/listen.c +++ b/src/sipevent/listen.c @@ -3,7 +3,6 @@ * * Copyright (C) 2010 Creytiv.com */ -#include #include #include #include @@ -136,6 +135,7 @@ static void notify_handler(struct sipevent_sock *sock, const struct sip_hdr *hdr; struct sipsub *sub; uint32_t nrefs; + char m[256]; int err; hdr = sip_msg_hdr(msg, SIP_HDR_EVENT); @@ -165,7 +165,8 @@ static void notify_handler(struct sipevent_sock *sock, err = sub->forkh(&fsub, sub, msg, sub->arg); if (err) { - (void)sip_reply(sip, msg, 500, strerror(err)); + (void)sip_reply(sip, msg, 500, + str_error(err, m, sizeof(m))); return; } @@ -174,7 +175,8 @@ static void notify_handler(struct sipevent_sock *sock, else { err = sip_dialog_create(sub->dlg, msg); if (err) { - (void)sip_reply(sip, msg, 500, strerror(err)); + (void)sip_reply(sip, msg, 500, + str_error(err, m, sizeof(m))); return; } } @@ -192,7 +194,8 @@ static void notify_handler(struct sipevent_sock *sock, err = pl_strdup(&sub->id, &event.id); if (err) { - (void)sip_treply(NULL, sip, msg, 500, strerror(err)); + (void)sip_treply(NULL, sip, msg, 500, + str_error(err, m, sizeof(m))); return; } } diff --git a/src/sipsess/listen.c b/src/sipsess/listen.c index 9b94ab1..f0190d0 100644 --- a/src/sipsess/listen.c +++ b/src/sipsess/listen.c @@ -3,7 +3,6 @@ * * Copyright (C) 2010 Creytiv.com */ -#include #include #include #include @@ -187,6 +186,7 @@ static void reinvite_handler(struct sipsess_sock *sock, struct sip *sip = sock->sip; struct sipsess *sess; struct mbuf *desc; + char m[256]; int err; sess = sipsess_find(sock, msg); @@ -216,7 +216,7 @@ static void reinvite_handler(struct sipsess_sock *sock, err = sess->offerh(&desc, msg, sess->arg); if (err) { - (void)sip_reply(sip, msg, 488, strerror(err)); + (void)sip_reply(sip, msg, 488, str_error(err, m, sizeof(m))); return; } diff --git a/src/stun/dnsdisc.c b/src/stun/dnsdisc.c index ac6b6a3..4bead19 100644 --- a/src/stun/dnsdisc.c +++ b/src/stun/dnsdisc.c @@ -47,7 +47,7 @@ static void resolved(const struct stun_dns *dns, int err) stun_dns_h *dnsh = dns->dnsh; void *dnsh_arg = dns->arg; - DEBUG_INFO("resolved: %J (%s)\n", &dns->srv, strerror(err)); + DEBUG_INFO("resolved: %J (%m)\n", &dns->srv, err); dnsh(err, &dns->srv, dnsh_arg); } @@ -190,7 +190,7 @@ static void srv_handler(int err, const struct dnshdr *hdr, struct list *ansl, err = a_or_aaaa_query(dns, rr->rdata.srv.target); if (err) { - DEBUG_WARNING("SRV: A lookup failed (%s)\n", strerror(err)); + DEBUG_WARNING("SRV: A lookup failed (%m)\n", err); goto out; } @@ -263,8 +263,8 @@ int stun_server_discover(struct stun_dns **dnsp, struct dnsc *dnsc, err = a_or_aaaa_query(dns, domain); if (err) { - DEBUG_WARNING("%s: A/AAAA lookup failed (%s)\n", - domain, strerror(err)); + DEBUG_WARNING("%s: A/AAAA lookup failed (%m)\n", + domain, err); goto out; } } @@ -278,8 +278,7 @@ int stun_server_discover(struct stun_dns **dnsp, struct dnsc *dnsc, err = dnsc_query(&dns->dq, dnsc, q, DNS_TYPE_SRV, DNS_CLASS_IN, true, srv_handler, dns); if (err) { - DEBUG_WARNING("%s: SRV lookup failed (%s)\n", q, - strerror(err)); + DEBUG_WARNING("%s: SRV lookup failed (%m)\n", q, err); goto out; } } diff --git a/src/tcp/symbian/tcp.cpp b/src/tcp/symbian/tcp.cpp index cbd929c..225ef94 100644 --- a/src/tcp/symbian/tcp.cpp +++ b/src/tcp/symbian/tcp.cpp @@ -5,7 +5,6 @@ */ #include #include -#include extern "C" { #include @@ -617,7 +616,7 @@ void tcp_conn::recv() void tcp_conn::conn_close(int err) { - DEBUG_INFO("tcp conn close (%s)\n", strerror(err)); + DEBUG_INFO("tcp conn close (%m)\n", err); /* Stop receiving */ if (ctc->receiving) { @@ -822,7 +821,7 @@ int tcp_conn_alloc(struct tcp_conn **tcp, const struct sa *peer, out: if (err) { - DEBUG_WARNING("conn_alloc: %J (%s)\n", peer, strerror(err)); + DEBUG_WARNING("conn_alloc: %J (%m)\n", peer, err); mem_deref(tc); } return err; diff --git a/src/tcp/tcp.c b/src/tcp/tcp.c index 2c35f45..a08f7a5 100644 --- a/src/tcp/tcp.c +++ b/src/tcp/tcp.c @@ -287,8 +287,7 @@ static void tcp_recv_handler(int flags, void *arg) /* check for any errors */ if (-1 == getsockopt(tc->fdc, SOL_SOCKET, SO_ERROR, BUF_CAST &err, &err_len)) { - DEBUG_WARNING("recv handler: getsockopt: (%s)\n", - strerror(errno)); + DEBUG_WARNING("recv handler: getsockopt: (%m)\n", errno); return; } @@ -298,8 +297,7 @@ static void tcp_recv_handler(int flags, void *arg) } #if 0 if (EINPROGRESS != err && EALREADY != err) { - DEBUG_WARNING("recv handler: Socket error (%s)\n", - strerror(err)); + DEBUG_WARNING("recv handler: Socket error (%m)\n", err); return; } #endif @@ -346,8 +344,7 @@ static void tcp_recv_handler(int flags, void *arg) err = fd_listen(tc->fdc, FD_READ, tcp_recv_handler, tc); if (err) { - DEBUG_WARNING("recv handler: fd_listen(): %s\n", - strerror(err)); + DEBUG_WARNING("recv handler: fd_listen(): %m\n", err); conn_close(tc, err); return; } @@ -383,7 +380,7 @@ static void tcp_recv_handler(int flags, void *arg) return; } else if (n < 0) { - DEBUG_WARNING("recv handler: recv(): %s\n", strerror(errno)); + DEBUG_WARNING("recv handler: recv(): %m\n", errno); goto out; } @@ -476,7 +473,7 @@ static void tcp_sockopt_set(int fd) err = setsockopt(fd, SOL_SOCKET, SO_LINGER, BUF_CAST &dl, sizeof(dl)); if (err) { - DEBUG_WARNING("sockopt: SO_LINGER (%s)\n", strerror(err)); + DEBUG_WARNING("sockopt: SO_LINGER (%m)\n", err); } #else (void)fd; @@ -537,8 +534,7 @@ static void tcp_conn_handler(int flags, void *arg) err = net_sockopt_blocking_set(ts->fdc, false); if (err) { - DEBUG_WARNING("conn handler: nonblock set: %s\n", - strerror(err)); + DEBUG_WARNING("conn handler: nonblock set: %m\n", err); (void)close(ts->fdc); ts->fdc = -1; return; @@ -622,8 +618,7 @@ int tcp_sock_alloc(struct tcp_sock **tsp, const struct sa *local, err = net_sockopt_blocking_set(fd, false); if (err) { - DEBUG_WARNING("listen: nonblock set: %s\n", - strerror(err)); + DEBUG_WARNING("listen: nonblock set: %m\n", err); (void)close(fd); continue; } @@ -701,8 +696,8 @@ int tcp_sock_bind(struct tcp_sock *ts, const struct sa *local) if (bind(ts->fd, r->ai_addr, SIZ_CAST r->ai_addrlen) < 0) { err = errno; - DEBUG_WARNING("sock_bind: bind: %s (af=%d, %J)\n", - strerror(err), r->ai_family, local); + DEBUG_WARNING("sock_bind: bind: %m (af=%d, %J)\n", + err, r->ai_family, local); continue; } @@ -739,7 +734,7 @@ int tcp_sock_listen(struct tcp_sock *ts, int backlog) if (listen(ts->fd, backlog) < 0) { err = errno; - DEBUG_WARNING("sock_listen: listen(): %s\n", strerror(err)); + DEBUG_WARNING("sock_listen: listen(): %m\n", err); return err; } @@ -779,7 +774,7 @@ int tcp_accept(struct tcp_conn **tcp, struct tcp_sock *ts, tcp_estab_h *eh, err = fd_listen(tc->fdc, FD_READ | FD_WRITE | FD_EXCEPT, tcp_recv_handler, tc); if (err) { - DEBUG_WARNING("accept: fd_listen(): %s\n", strerror(err)); + DEBUG_WARNING("accept: fd_listen(): %m\n", err); } if (err) @@ -868,8 +863,7 @@ int tcp_conn_alloc(struct tcp_conn **tcp, err = net_sockopt_blocking_set(tc->fdc, false); if (err) { - DEBUG_WARNING("connect: nonblock set: %s\n", - strerror(err)); + DEBUG_WARNING("connect: nonblock set: %m\n", err); (void)close(tc->fdc); tc->fdc = -1; continue; @@ -945,8 +939,8 @@ int tcp_conn_bind(struct tcp_conn *tc, const struct sa *local) } err = errno; - DEBUG_WARNING("conn_bind: bind(): %J: %s\n", - local, strerror(err)); + DEBUG_WARNING("conn_bind: bind(): %J: %m\n", + local, err); continue; } @@ -959,8 +953,7 @@ int tcp_conn_bind(struct tcp_conn *tc, const struct sa *local) freeaddrinfo(res); if (err) { - DEBUG_WARNING("conn_bind failed: %J (%s)\n", local, - strerror(err)); + DEBUG_WARNING("conn_bind failed: %J (%m)\n", local, err); } return err; @@ -1039,8 +1032,8 @@ int tcp_conn_connect(struct tcp_conn *tc, const struct sa *peer) if (EINPROGRESS != errno && EALREADY != errno) { tc->fdc = -1; err = errno; - DEBUG_INFO("connect: connect() %J: %s\n", - peer, strerror(err)); + DEBUG_INFO("connect: connect() %J: %m\n", + peer, err); } } } @@ -1101,8 +1094,7 @@ static int tcp_send_internal(struct tcp_conn *tc, struct mbuf *mb, #endif err = errno; - DEBUG_WARNING("send: write(): %s (fdc=%d)\n", strerror(err), - tc->fdc); + DEBUG_WARNING("send: write(): %m (fdc=%d)\n", err, tc->fdc); #ifdef WIN32 DEBUG_WARNING("WIN32 error: %d\n", WSAGetLastError()); @@ -1222,8 +1214,7 @@ int tcp_sock_local_get(const struct tcp_sock *ts, struct sa *local) sa_init(local, AF_UNSPEC); if (getsockname(ts->fd, &local->u.sa, &local->len) < 0) { - DEBUG_WARNING("local get: getsockname(): %s\n", - strerror(errno)); + DEBUG_WARNING("local get: getsockname(): %m\n", errno); return errno; } @@ -1247,8 +1238,7 @@ int tcp_conn_local_get(const struct tcp_conn *tc, struct sa *local) sa_init(local, AF_UNSPEC); if (getsockname(tc->fdc, &local->u.sa, &local->len) < 0) { - DEBUG_WARNING("conn local get: getsockname(): %s\n", - strerror(errno)); + DEBUG_WARNING("conn local get: getsockname(): %m\n", errno); return errno; } @@ -1272,8 +1262,7 @@ int tcp_conn_peer_get(const struct tcp_conn *tc, struct sa *peer) sa_init(peer, AF_UNSPEC); if (getpeername(tc->fdc, &peer->u.sa, &peer->len) < 0) { - DEBUG_WARNING("conn peer get: getpeername(): %s\n", - strerror(errno)); + DEBUG_WARNING("conn peer get: getpeername(): %m\n", errno); return errno; } diff --git a/src/tmr/tmr.c b/src/tmr/tmr.c index 035ceec..a8c125e 100644 --- a/src/tmr/tmr.c +++ b/src/tmr/tmr.c @@ -136,8 +136,7 @@ uint64_t tmr_jiffies(void) struct timeval now; if (0 != gettimeofday(&now, NULL)) { - DEBUG_WARNING("jiffies: gettimeofday() failed (%s)\n", - strerror(errno)); + DEBUG_WARNING("jiffies: gettimeofday() failed (%m)\n", errno); return 0; } diff --git a/src/udp/udp.c b/src/udp/udp.c index 07555d2..490710d 100644 --- a/src/udp/udp.c +++ b/src/udp/udp.c @@ -328,16 +328,14 @@ int udp_listen(struct udp_sock **usp, const struct sa *local, err = net_sockopt_blocking_set(fd, false); if (err) { - DEBUG_WARNING("udp listen: nonblock set: %s\n", - strerror(err)); + DEBUG_WARNING("udp listen: nonblock set: %m\n", err); (void)close(fd); continue; } if (bind(fd, r->ai_addr, SIZ_CAST r->ai_addrlen) < 0) { err = errno; - DEBUG_INFO("listen: bind(): %s (%J)\n", - strerror(err), local); + DEBUG_INFO("listen: bind(): %m (%J)\n", err, local); (void)close(fd); continue; } @@ -450,7 +448,7 @@ static int udp_send_internal(struct udp_sock *us, const struct sa *dst, /* Connected socket? */ if (us->conn) { if (0 != connect(fd, &dst->u.sa, dst->len)) { - DEBUG_WARNING("send: connect: %s\n", strerror(errno)); + DEBUG_WARNING("send: connect: %m\n", errno); us->conn = false; }