moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

warnless?: Added some integer based conversion functions

Browse Source
This commit is contained in:
Steve Holme 2016-03-26 11:09:01 +00:00
parent 1f49780c4c
commit 696bc6b9c9
2 changed files with 66 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
lib/warnless.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -378,6 +378,63 @@ int curlx_sztosi(ssize_t sznum)
#endif #endif
} }
/*
** unsigned int to unsigned short
*/
unsigned short curlx_uitous(unsigned int uinum)
{
#ifdef __INTEL_COMPILER
# pragma warning(push)
# pragma warning(disable:810) /* conversion may lose significant bits */
#endif
DEBUGASSERT(uinum <= (unsigned int) CURL_MASK_USHORT);
return (unsigned short) (uinum & (unsigned int) CURL_MASK_USHORT);
#ifdef __INTEL_COMPILER
# pragma warning(pop)
#endif
}
/*
** unsigned int to unsigned char
*/
unsigned char curlx_uitouc(unsigned int uinum)
{
#ifdef __INTEL_COMPILER
# pragma warning(push)
# pragma warning(disable:810) /* conversion may lose significant bits */
#endif
DEBUGASSERT(uinum <= (unsigned int) CURL_MASK_UCHAR);
return (unsigned char) (uinum & (unsigned int) CURL_MASK_UCHAR);
#ifdef __INTEL_COMPILER
# pragma warning(pop)
#endif
}
/*
** unsigned int to signed int
*/
int curlx_uitosi(unsigned int uinum)
{
#ifdef __INTEL_COMPILER
# pragma warning(push)
# pragma warning(disable:810) /* conversion may lose significant bits */
#endif
DEBUGASSERT(uinum <= (unsigned int) CURL_MASK_SINT);
return (int) (uinum & (unsigned int) CURL_MASK_SINT);
#ifdef __INTEL_COMPILER
# pragma warning(pop)
#endif
}
/* /*
** signed int to unsigned size_t ** signed int to unsigned size_t
*/ */

10
lib/warnless.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -52,6 +52,12 @@ size_t curlx_sotouz(curl_off_t sonum);
int curlx_sztosi(ssize_t sznum); int curlx_sztosi(ssize_t sznum);
unsigned short curlx_uitous(unsigned int uinum);
unsigned char curlx_uitouc(unsigned int uinum);
int curlx_uitosi(unsigned int uinum);
size_t curlx_sitouz(int sinum); size_t curlx_sitouz(int sinum);
#ifdef USE_WINSOCK #ifdef USE_WINSOCK
@ -82,7 +88,7 @@ ssize_t curlx_write(int fd, const void *buf, size_t count);
int curlx_FD_ISSET(int fd, fd_set *fdset); int curlx_FD_ISSET(int fd, fd_set *fdset);
void curlx_FD_SET(int fd, fd_set *fdset); void curlx_FD_SET(int fd, fd_set *fdset);
3
void curlx_FD_ZERO(fd_set *fdset); void curlx_FD_ZERO(fd_set *fdset);
unsigned short curlx_htons(unsigned short usnum); unsigned short curlx_htons(unsigned short usnum);