diff --git a/reactos/lib/3rdparty/adns/src/check.c b/reactos/lib/3rdparty/adns/src/check.c index 211f6c6cff9..74703cab103 100644 --- a/reactos/lib/3rdparty/adns/src/check.c +++ b/reactos/lib/3rdparty/adns/src/check.c @@ -102,7 +102,7 @@ static void checkc_notcpbuf(adns_state ads) { static void checkc_global(adns_state ads) { int i; - assert(ads->udpsocket >= 0); + assert(ads->udpsocket != INVALID_SOCKET); for (i=0; insortlist; i++) assert(!(ads->sortlist[i].base.s_addr & ~ads->sortlist[i].mask.s_addr)); @@ -111,7 +111,7 @@ static void checkc_global(adns_state ads) { switch (ads->tcpstate) { case server_connecting: - assert(ads->tcpsocket >= 0); + assert(ads->tcpsocket != INVALID_SOCKET); checkc_notcpbuf(ads); break; case server_disconnected: @@ -120,7 +120,7 @@ static void checkc_global(adns_state ads) { checkc_notcpbuf(ads); break; case server_ok: - assert(ads->tcpsocket >= 0); + assert(ads->tcpsocket != INVALID_SOCKET); assert(ads->tcprecv_skip <= ads->tcprecv.used); break; default: diff --git a/reactos/lib/3rdparty/adns/src/event.c b/reactos/lib/3rdparty/adns/src/event.c index 4dd61f54d8f..cd34ff9ceab 100644 --- a/reactos/lib/3rdparty/adns/src/event.c +++ b/reactos/lib/3rdparty/adns/src/event.c @@ -114,7 +114,7 @@ void adns__tcp_tryconnect(adns_state ads, struct timeval now) { ADNS_CLEAR_ERRNO fd= socket(AF_INET,SOCK_STREAM,proto->p_proto); ADNS_CAPTURE_ERRNO; - if (fd<0) { + if (fd == INVALID_SOCKET) { adns__diag(ads,-1,0,"cannot create TCP socket: %s",strerror(errno)); return; } diff --git a/reactos/lib/3rdparty/adns/src/general.c b/reactos/lib/3rdparty/adns/src/general.c index 4d24fda8ba6..1b61686d79f 100644 --- a/reactos/lib/3rdparty/adns/src/general.c +++ b/reactos/lib/3rdparty/adns/src/general.c @@ -254,7 +254,7 @@ static const struct sinfo { SINFO( nodata, "No such data" ) }; -static int si_compar(const void *key, const void *elem) { +static int __cdecl si_compar(const void *key, const void *elem) { const adns_status *st= key; const struct sinfo *si= elem; @@ -295,7 +295,7 @@ static const struct stinfo { STINFO( permfail ) }; -static int sti_compar(const void *key, const void *elem) { +static int __cdecl sti_compar(const void *key, const void *elem) { const adns_status *st= key; const struct stinfo *sti= elem; diff --git a/reactos/lib/3rdparty/adns/src/setup.c b/reactos/lib/3rdparty/adns/src/setup.c index 3b8a26a67a7..3995d3cba00 100644 --- a/reactos/lib/3rdparty/adns/src/setup.c +++ b/reactos/lib/3rdparty/adns/src/setup.c @@ -536,7 +536,7 @@ static int init_finish(adns_state ads) { ADNS_CLEAR_ERRNO; ads->udpsocket= socket(AF_INET,SOCK_DGRAM,proto->p_proto); ADNS_CAPTURE_ERRNO; - if (ads->udpsocket<0) { r= errno; goto x_free; } + if (ads->udpsocket == INVALID_SOCKET) { r= errno; goto x_free; } r= adns__setnonblock(ads,ads->udpsocket); if (r) { r= errno; goto x_closeudp; } @@ -682,7 +682,7 @@ void adns_finish(adns_state ads) { else break; } adns_socket_close(ads->udpsocket); - if (ads->tcpsocket >= 0) adns_socket_close(ads->tcpsocket); + if (ads->tcpsocket != INVALID_SOCKET) adns_socket_close(ads->tcpsocket); adns__vbuf_free(&ads->tcpsend); adns__vbuf_free(&ads->tcprecv); freesearchlist(ads);