mirror of https://github.com/c-ares/c-ares.git
remove ares_nowarn helpers #580
Now that the code internally is using proper datatypes, there is no longer a need for ares_nowarn helpers. Remove them. Fix By: Brad House (@bradh352)pull/582/head
Brad House
1 year ago
committed by
GitHub
parent
86e417e247
commit
c3e050ac72
22 changed files with 14 additions and 391 deletions
@ -1,269 +0,0 @@ |
||||
/* MIT License
|
||||
* |
||||
* Copyright (c) 2010 Daniel Stenberg |
||||
* |
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy |
||||
* of this software and associated documentation files (the "Software"), to deal |
||||
* in the Software without restriction, including without limitation the rights |
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
||||
* copies of the Software, and to permit persons to whom the Software is |
||||
* furnished to do so, subject to the following conditions: |
||||
* |
||||
* The above copyright notice and this permission notice (including the next |
||||
* paragraph) shall be included in all copies or substantial portions of the |
||||
* Software. |
||||
* |
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
||||
* SOFTWARE. |
||||
* |
||||
* SPDX-License-Identifier: MIT |
||||
*/ |
||||
|
||||
#include "ares_setup.h" |
||||
|
||||
#ifdef HAVE_ASSERT_H |
||||
# include <assert.h> |
||||
#endif |
||||
|
||||
#ifdef HAVE_LIMITS_H |
||||
# include <limits.h> |
||||
#endif |
||||
|
||||
#if defined(__INTEL_COMPILER) && defined(__unix__) |
||||
|
||||
# ifdef HAVE_NETINET_IN_H |
||||
# include <netinet/in.h> |
||||
# endif |
||||
# ifdef HAVE_ARPA_INET_H |
||||
# include <arpa/inet.h> |
||||
# endif |
||||
|
||||
#endif /* __INTEL_COMPILER && __unix__ */ |
||||
|
||||
#define BUILDING_ARES_NOWARN_C 1 |
||||
|
||||
#include "ares_nowarn.h" |
||||
|
||||
#ifndef HAVE_LIMITS_H |
||||
/* systems without <limits.h> we guess have 16 bit shorts, 32bit ints and
|
||||
32bit longs */ |
||||
# define CARES_MASK_SSHORT 0x7FFF |
||||
# define CARES_MASK_USHORT 0xFFFF |
||||
# define CARES_MASK_SINT 0x7FFFFFFF |
||||
# define CARES_MASK_UINT 0xFFFFFFFF |
||||
# define CARES_MASK_SLONG 0x7FFFFFFFL |
||||
# define CARES_MASK_ULONG 0xFFFFFFFFUL |
||||
#else |
||||
# define CARES_MASK_SSHORT SHRT_MAX |
||||
# define CARES_MASK_USHORT USHRT_MAX |
||||
# define CARES_MASK_SINT INT_MAX |
||||
# define CARES_MASK_UINT UINT_MAX |
||||
# define CARES_MASK_SLONG LONG_MAX |
||||
# define CARES_MASK_ULONG ULONG_MAX |
||||
#endif |
||||
|
||||
/*
|
||||
** unsigned size_t to signed long |
||||
*/ |
||||
|
||||
long aresx_uztosl(size_t uznum) |
||||
{ |
||||
#ifdef __INTEL_COMPILER |
||||
# pragma warning(push) |
||||
# pragma warning(disable : 810) /* conversion may lose significant bits */ |
||||
#endif |
||||
|
||||
return (long)(uznum & (size_t)CARES_MASK_SLONG); |
||||
|
||||
#ifdef __INTEL_COMPILER |
||||
# pragma warning(pop) |
||||
#endif |
||||
} |
||||
|
||||
/*
|
||||
** unsigned size_t to signed int |
||||
*/ |
||||
|
||||
int aresx_uztosi(size_t uznum) |
||||
{ |
||||
#ifdef __INTEL_COMPILER |
||||
# pragma warning(push) |
||||
# pragma warning(disable : 810) /* conversion may lose significant bits */ |
||||
#endif |
||||
|
||||
return (int)(uznum & (size_t)CARES_MASK_SINT); |
||||
|
||||
#ifdef __INTEL_COMPILER |
||||
# pragma warning(pop) |
||||
#endif |
||||
} |
||||
|
||||
/*
|
||||
** unsigned size_t to signed short |
||||
*/ |
||||
|
||||
short aresx_uztoss(size_t uznum) |
||||
{ |
||||
#ifdef __INTEL_COMPILER |
||||
# pragma warning(push) |
||||
# pragma warning(disable : 810) /* conversion may lose significant bits */ |
||||
#endif |
||||
|
||||
return (short)(uznum & (size_t)CARES_MASK_SSHORT); |
||||
|
||||
#ifdef __INTEL_COMPILER |
||||
# pragma warning(pop) |
||||
#endif |
||||
} |
||||
|
||||
/*
|
||||
** signed int to signed short |
||||
*/ |
||||
|
||||
short aresx_sitoss(int sinum) |
||||
{ |
||||
#ifdef __INTEL_COMPILER |
||||
# pragma warning(push) |
||||
# pragma warning(disable : 810) /* conversion may lose significant bits */ |
||||
#endif |
||||
|
||||
DEBUGASSERT(sinum >= 0); |
||||
return (short)(sinum & (int)CARES_MASK_SSHORT); |
||||
|
||||
#ifdef __INTEL_COMPILER |
||||
# pragma warning(pop) |
||||
#endif |
||||
} |
||||
|
||||
/*
|
||||
** signed long to signed int |
||||
*/ |
||||
|
||||
int aresx_sltosi(long slnum) |
||||
{ |
||||
#ifdef __INTEL_COMPILER |
||||
# pragma warning(push) |
||||
# pragma warning(disable : 810) /* conversion may lose significant bits */ |
||||
#endif |
||||
|
||||
DEBUGASSERT(slnum >= 0); |
||||
return (int)(slnum & (long)CARES_MASK_SINT); |
||||
|
||||
#ifdef __INTEL_COMPILER |
||||
# pragma warning(pop) |
||||
#endif |
||||
} |
||||
|
||||
/*
|
||||
** signed ares_ssize_t to signed int |
||||
*/ |
||||
|
||||
int aresx_sztosi(ares_ssize_t sznum) |
||||
{ |
||||
#ifdef __INTEL_COMPILER |
||||
# pragma warning(push) |
||||
# pragma warning(disable : 810) /* conversion may lose significant bits */ |
||||
#endif |
||||
|
||||
DEBUGASSERT(sznum >= 0); |
||||
return (int)(sznum & (ares_ssize_t)CARES_MASK_SINT); |
||||
|
||||
#ifdef __INTEL_COMPILER |
||||
# pragma warning(pop) |
||||
#endif |
||||
} |
||||
|
||||
/*
|
||||
** signed ares_ssize_t to unsigned int |
||||
*/ |
||||
|
||||
unsigned int aresx_sztoui(ares_ssize_t sznum) |
||||
{ |
||||
#ifdef __INTEL_COMPILER |
||||
# pragma warning(push) |
||||
# pragma warning(disable : 810) /* conversion may lose significant bits */ |
||||
#endif |
||||
|
||||
DEBUGASSERT(sznum >= 0); |
||||
return (unsigned int)(sznum & (ares_ssize_t)CARES_MASK_UINT); |
||||
|
||||
#ifdef __INTEL_COMPILER |
||||
# pragma warning(pop) |
||||
#endif |
||||
} |
||||
|
||||
/*
|
||||
** signed int to unsigned short |
||||
*/ |
||||
|
||||
unsigned short aresx_sitous(int sinum) |
||||
{ |
||||
#ifdef __INTEL_COMPILER |
||||
# pragma warning(push) |
||||
# pragma warning(disable : 810) /* conversion may lose significant bits */ |
||||
#endif |
||||
|
||||
DEBUGASSERT(sinum >= 0); |
||||
return (unsigned short)(sinum & (int)CARES_MASK_USHORT); |
||||
|
||||
#ifdef __INTEL_COMPILER |
||||
# pragma warning(pop) |
||||
#endif |
||||
} |
||||
|
||||
#if defined(__INTEL_COMPILER) && defined(__unix__) |
||||
|
||||
int aresx_FD_ISSET(int fd, fd_set *fdset) |
||||
{ |
||||
# pragma warning(push) |
||||
# pragma warning(disable : 1469) /* clobber ignored */ |
||||
return FD_ISSET(fd, fdset); |
||||
# pragma warning(pop) |
||||
} |
||||
|
||||
void aresx_FD_SET(int fd, fd_set *fdset) |
||||
{ |
||||
# pragma warning(push) |
||||
# pragma warning(disable : 1469) /* clobber ignored */ |
||||
FD_SET(fd, fdset); |
||||
# pragma warning(pop) |
||||
} |
||||
|
||||
void aresx_FD_ZERO(fd_set *fdset) |
||||
{ |
||||
# pragma warning(push) |
||||
# pragma warning(disable : 593) /* variable was set but never used */ |
||||
FD_ZERO(fdset); |
||||
# pragma warning(pop) |
||||
} |
||||
|
||||
unsigned short aresx_htons(unsigned short usnum) |
||||
{ |
||||
# if (__INTEL_COMPILER == 910) && defined(__i386__) |
||||
return (unsigned short)(((usnum << 8) & 0xFF00) | ((usnum >> 8) & 0x00FF)); |
||||
# else |
||||
# pragma warning(push) |
||||
# pragma warning(disable : 810) /* conversion may lose significant bits */ |
||||
return htons(usnum); |
||||
# pragma warning(pop) |
||||
# endif |
||||
} |
||||
|
||||
unsigned short aresx_ntohs(unsigned short usnum) |
||||
{ |
||||
# if (__INTEL_COMPILER == 910) && defined(__i386__) |
||||
return (unsigned short)(((usnum << 8) & 0xFF00) | ((usnum >> 8) & 0x00FF)); |
||||
# else |
||||
# pragma warning(push) |
||||
# pragma warning(disable : 810) /* conversion may lose significant bits */ |
||||
return ntohs(usnum); |
||||
# pragma warning(pop) |
||||
# endif |
||||
} |
||||
|
||||
#endif /* __INTEL_COMPILER && __unix__ */ |
||||
@ -1,70 +0,0 @@ |
||||
/* MIT License
|
||||
* |
||||
* Copyright (c) 2010 Daniel Stenberg |
||||
* |
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy |
||||
* of this software and associated documentation files (the "Software"), to deal |
||||
* in the Software without restriction, including without limitation the rights |
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
||||
* copies of the Software, and to permit persons to whom the Software is |
||||
* furnished to do so, subject to the following conditions: |
||||
* |
||||
* The above copyright notice and this permission notice (including the next |
||||
* paragraph) shall be included in all copies or substantial portions of the |
||||
* Software. |
||||
* |
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
||||
* SOFTWARE. |
||||
* |
||||
* SPDX-License-Identifier: MIT |
||||
*/ |
||||
#ifndef HEADER_CARES_NOWARN_H |
||||
#define HEADER_CARES_NOWARN_H |
||||
|
||||
long aresx_uztosl(size_t uznum); |
||||
int aresx_uztosi(size_t uznum); |
||||
short aresx_uztoss(size_t uznum); |
||||
|
||||
short aresx_sitoss(int sinum); |
||||
|
||||
int aresx_sltosi(long slnum); |
||||
|
||||
int aresx_sztosi(ares_ssize_t sznum); |
||||
|
||||
unsigned int aresx_sztoui(ares_ssize_t sznum); |
||||
|
||||
unsigned short aresx_sitous(int sinum); |
||||
|
||||
#if defined(__INTEL_COMPILER) && defined(__unix__) |
||||
|
||||
int aresx_FD_ISSET(int fd, fd_set *fdset); |
||||
|
||||
void aresx_FD_SET(int fd, fd_set *fdset); |
||||
|
||||
void aresx_FD_ZERO(fd_set *fdset); |
||||
|
||||
unsigned short aresx_htons(unsigned short usnum); |
||||
|
||||
unsigned short aresx_ntohs(unsigned short usnum); |
||||
|
||||
# ifndef BUILDING_ARES_NOWARN_C |
||||
# undef FD_ISSET |
||||
# define FD_ISSET(a, b) aresx_FD_ISSET((a), (b)) |
||||
# undef FD_SET |
||||
# define FD_SET(a, b) aresx_FD_SET((a), (b)) |
||||
# undef FD_ZERO |
||||
# define FD_ZERO(a) aresx_FD_ZERO((a)) |
||||
# undef htons |
||||
# define htons(a) aresx_htons((a)) |
||||
# undef ntohs |
||||
# define ntohs(a) aresx_ntohs((a)) |
||||
# endif |
||||
|
||||
#endif /* __INTEL_COMPILER && __unix__ */ |
||||
|
||||
#endif /* HEADER_CARES_NOWARN_H */ |
||||
@ -1,9 +1,7 @@ |
||||
# Copyright (C) The c-ares project and its contributors |
||||
# SPDX-License-Identifier: MIT |
||||
SAMPLESOURCES = ares_getopt.c \ |
||||
../lib/ares_nowarn.c \ |
||||
../lib/ares_strcasecmp.c |
||||
|
||||
SAMPLEHEADERS = ares_getopt.h \ |
||||
../lib/ares_nowarn.h \ |
||||
../lib/ares_strcasecmp.h |
||||
|
||||
Loading…
Reference in new issue