From a78201bae0f80de56c7d132c4d8b7841bb7b95d0 Mon Sep 17 00:00:00 2001 From: Dmitry Podgorny Date: Fri, 16 Oct 2015 14:58:18 +0300 Subject: [PATCH] sock: use xmpp_snprintf instead of snprintf --- src/sock.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/sock.c b/src/sock.c index ef56103..05a13da 100644 --- a/src/sock.c +++ b/src/sock.c @@ -23,7 +23,6 @@ #include #include #include -#define snprintf _snprintf #else #include #include @@ -39,6 +38,7 @@ #endif #include "sock.h" +#include "snprintf.h" void sock_initialize(void) { @@ -80,7 +80,7 @@ sock_t sock_connect(const char * const host, const unsigned int port) struct addrinfo *res, *ainfo, hints; int err; - snprintf(service, 6, "%u", port); + xmpp_snprintf(service, 6, "%u", port); memset(&hints, 0, sizeof(struct addrinfo)); hints.ai_family = AF_UNSPEC; @@ -507,8 +507,8 @@ int sock_srv_lookup(const char *service, const char *proto, int set = 0; char fulldomain[2048]; - snprintf(fulldomain, sizeof(fulldomain), - "_%s._%s.%s", service, proto, domain); + xmpp_snprintf(fulldomain, sizeof(fulldomain), + "_%s._%s.%s", service, proto, domain); #ifdef _WIN32 /* try using dnsapi first */ @@ -535,7 +535,7 @@ int sock_srv_lookup(const char *service, const char *proto, while (current) { if (current->wType == DNS_TYPE_SRV) { - snprintf(resulttarget, resulttargetlength, "%s", current->Data.Srv.pNameTarget); + xmpp_snprintf(resulttarget, resulttargetlength, "%s", current->Data.Srv.pNameTarget); *resultport = current->Data.Srv.wPort; set = 1; @@ -819,7 +819,7 @@ int sock_srv_lookup(const char *service, const char *proto, { struct dnsquery_srvrdata *srvrdata = &(rr.rdata); - snprintf(resulttarget, resulttargetlength, "%s", srvrdata->target); + xmpp_snprintf(resulttarget, resulttargetlength, "%s", srvrdata->target); *resultport = srvrdata->port; set = 1; } @@ -862,8 +862,8 @@ int sock_srv_lookup(const char *service, const char *proto, struct dnsquery_srvrdata *srvrdata = &(rr.rdata); if (srvrdata->priority < min || !set) { - snprintf(resulttarget, resulttargetlength, "%s", - srvrdata->target); + xmpp_snprintf(resulttarget, resulttargetlength, "%s", + srvrdata->target); *resultport = srvrdata->port; set = 1; min = srvrdata->priority;