From 048438345aed2acbb044e107946a804bc2d02363 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 19 Feb 2010 18:02:38 +0000 Subject: fix compiler warning --- lib/warnless.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 lib/warnless.h (limited to 'lib/warnless.h') diff --git a/lib/warnless.h b/lib/warnless.h new file mode 100644 index 000000000..cd257d3ed --- /dev/null +++ b/lib/warnless.h @@ -0,0 +1,28 @@ +#ifndef HEADER_CURL_WARNLESS_H +#define HEADER_CURL_WARNLESS_H +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at http://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + * $Id$ + ***************************************************************************/ + +unsigned short Curl_ultous(unsigned long ulnum); + +#endif /* HEADER_CURL_WARNLESS_H */ -- cgit v1.2.1 From dc9f0a9758536d1bd7bfa2f9b073d6a63570f721 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 22 Feb 2010 02:37:13 +0000 Subject: fix compiler warning --- lib/warnless.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/warnless.h') diff --git a/lib/warnless.h b/lib/warnless.h index cd257d3ed..d8734910a 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -25,4 +25,6 @@ unsigned short Curl_ultous(unsigned long ulnum); +unsigned char Curl_ultouc(unsigned long ulnum); + #endif /* HEADER_CURL_WARNLESS_H */ -- cgit v1.2.1 From 439f62bfa8fff1b6370c286f4e06775aa81661bc Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 22 Feb 2010 18:56:29 +0000 Subject: convert Curl_ultous() and Curl_ultouc() functions to curlx_ultous() and curlx_ultouc(), exposing them through curlx.h to allow proper code reuse later in our test harness. --- lib/warnless.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/warnless.h') diff --git a/lib/warnless.h b/lib/warnless.h index d8734910a..0976088cd 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -23,8 +23,8 @@ * $Id$ ***************************************************************************/ -unsigned short Curl_ultous(unsigned long ulnum); +unsigned short curlx_ultous(unsigned long ulnum); -unsigned char Curl_ultouc(unsigned long ulnum); +unsigned char curlx_ultouc(unsigned long ulnum); #endif /* HEADER_CURL_WARNLESS_H */ -- cgit v1.2.1 From bcd1c7c2e92d41ab02163a36a1ab9d5a7afd83a9 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 26 Feb 2010 16:42:33 +0000 Subject: fix compiler warning --- lib/warnless.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/warnless.h') diff --git a/lib/warnless.h b/lib/warnless.h index 0976088cd..41688de41 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -27,4 +27,6 @@ unsigned short curlx_ultous(unsigned long ulnum); unsigned char curlx_ultouc(unsigned long ulnum); +int curlx_uztosi(size_t uznum); + #endif /* HEADER_CURL_WARNLESS_H */ -- cgit v1.2.1 From 2309b4e330b96bc2e1f8e36b6184015e59544037 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 24 Mar 2010 11:02:54 +0100 Subject: remove the CVSish $Id$ lines --- lib/warnless.h | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/warnless.h') diff --git a/lib/warnless.h b/lib/warnless.h index 41688de41..ac654fbc5 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -20,7 +20,6 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * - * $Id$ ***************************************************************************/ unsigned short curlx_ultous(unsigned long ulnum); -- cgit v1.2.1 From 7e3f0bffe5d930489db80e1d65c27fe44a51f6f4 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 1 Dec 2010 23:33:43 +0100 Subject: fix compiler warning: conversion may lose significant bits --- lib/warnless.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/warnless.h') diff --git a/lib/warnless.h b/lib/warnless.h index ac654fbc5..ed692d8cd 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -28,4 +28,10 @@ unsigned char curlx_ultouc(unsigned long ulnum); int curlx_uztosi(size_t uznum); +int curlx_sltosi(long slnum); + +unsigned int curlx_sltoui(long slnum); + +unsigned short curlx_sltous(long slnum); + #endif /* HEADER_CURL_WARNLESS_H */ -- cgit v1.2.1 From 07f60235b06a172a98082d11f065c13f7ecb1ec0 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Thu, 2 Dec 2010 18:46:13 +0100 Subject: fix compiler warning: rounding, sign extension, or loss of accuracy may result --- lib/warnless.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/warnless.h') diff --git a/lib/warnless.h b/lib/warnless.h index ed692d8cd..7181a6e38 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -34,4 +34,6 @@ unsigned int curlx_sltoui(long slnum); unsigned short curlx_sltous(long slnum); +ssize_t curlx_uztosz(size_t uznum); + #endif /* HEADER_CURL_WARNLESS_H */ -- cgit v1.2.1 From c1901f7ed0dc43a92e611ff4cfc00ad97425318f Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sat, 4 Dec 2010 05:53:07 +0100 Subject: fix compiler warning: conversion may lose significant bits --- lib/warnless.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/warnless.h') diff --git a/lib/warnless.h b/lib/warnless.h index 7181a6e38..7b9bd3c7f 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -36,4 +36,6 @@ unsigned short curlx_sltous(long slnum); ssize_t curlx_uztosz(size_t uznum); +size_t curlx_sotouz(curl_off_t sonum); + #endif /* HEADER_CURL_WARNLESS_H */ -- cgit v1.2.1 From b7357176063256a44b4a5a20c6b9bbe92bdda713 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 24 May 2011 20:39:58 +0200 Subject: compiler warning: fix Fix compiler warning: variable was set but never used Fix compiler warning: clobber ignored --- lib/warnless.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'lib/warnless.h') diff --git a/lib/warnless.h b/lib/warnless.h index 7b9bd3c7f..a27c7d32c 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -38,4 +38,20 @@ ssize_t curlx_uztosz(size_t uznum); size_t curlx_sotouz(curl_off_t sonum); +#if defined(__INTEL_COMPILER) && defined(__unix__) + +int curlx_FD_ISSET(int fd, fd_set *fdset); + +void curlx_FD_SET(int fd, fd_set *fdset); + +void curlx_FD_ZERO(fd_set *fdset); + +#ifndef BUILDING_WARNLESS_C +# define FD_ISSET(a,b) curlx_FD_ISSET((a),(b)) +# define FD_SET(a,b) curlx_FD_SET((a),(b)) +# define FD_ZERO(a) curlx_FD_ZERO((a)) +#endif + +#endif /* __INTEL_COMPILER && __unix__ */ + #endif /* HEADER_CURL_WARNLESS_H */ -- cgit v1.2.1 From a947a9ac621d08f80fd4004b7ff8ed872d471d80 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 25 May 2011 09:56:57 +0200 Subject: compiler warning: fix followup Fix compiler warning: variable was set but never used Fix compiler warning: clobber ignored --- lib/warnless.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/warnless.h') diff --git a/lib/warnless.h b/lib/warnless.h index a27c7d32c..dfa16ef29 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -47,8 +47,11 @@ void curlx_FD_SET(int fd, fd_set *fdset); void curlx_FD_ZERO(fd_set *fdset); #ifndef BUILDING_WARNLESS_C +# undef FD_ISSET # define FD_ISSET(a,b) curlx_FD_ISSET((a),(b)) +# undef FD_SET # define FD_SET(a,b) curlx_FD_SET((a),(b)) +# undef FD_ZERO # define FD_ZERO(a) curlx_FD_ZERO((a)) #endif -- cgit v1.2.1 From 3c9ff41a1fef4b03571f5a7f905e5016cae55208 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Thu, 26 May 2011 15:44:53 +0200 Subject: compiler warning: fix Fix compiler warning: conversion may lose significant bits --- lib/warnless.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lib/warnless.h') diff --git a/lib/warnless.h b/lib/warnless.h index dfa16ef29..9ac59ac29 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -46,6 +46,10 @@ void curlx_FD_SET(int fd, fd_set *fdset); void curlx_FD_ZERO(fd_set *fdset); +unsigned short curlx_htons(unsigned short usnum); + +unsigned short curlx_ntohs(unsigned short usnum); + #ifndef BUILDING_WARNLESS_C # undef FD_ISSET # define FD_ISSET(a,b) curlx_FD_ISSET((a),(b)) @@ -53,6 +57,10 @@ void curlx_FD_ZERO(fd_set *fdset); # define FD_SET(a,b) curlx_FD_SET((a),(b)) # undef FD_ZERO # define FD_ZERO(a) curlx_FD_ZERO((a)) +# undef htons +# define htons(a) curlx_htons((a)) +# undef ntohs +# define ntohs(a) curlx_ntohs((a)) #endif #endif /* __INTEL_COMPILER && __unix__ */ -- cgit v1.2.1 From fd00b382b2d33ef90c6f5c840a32b66c8ceb1662 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 24 Aug 2011 08:07:36 +0200 Subject: base64: fix Curl_base64_encode and Curl_base64_decode interfaces Previous interfaces for these libcurl internal functions did not allow to tell apart a legitimate zero size result from an error condition. These functions now return a CURLcode indicating function success or otherwise specific error. Output size is returned using a pointer argument. All usage of these two functions, and others closely related, has been adapted to the new interfaces. Relative error and OOM handling adapted or added where missing. Unit test 1302 also adapted. --- lib/warnless.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/warnless.h') diff --git a/lib/warnless.h b/lib/warnless.h index 9ac59ac29..27cf57c31 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -38,6 +38,8 @@ ssize_t curlx_uztosz(size_t uznum); size_t curlx_sotouz(curl_off_t sonum); +size_t curlx_sitouz(int sinum); + #if defined(__INTEL_COMPILER) && defined(__unix__) int curlx_FD_ISSET(int fd, fd_set *fdset); -- cgit v1.2.1 From 8e82ef9c324c12096f722801518178d0c92e9f80 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 13 Jan 2012 13:34:43 +0100 Subject: http_negotiate_sspi.c: fix compiler warning --- lib/warnless.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/warnless.h') diff --git a/lib/warnless.h b/lib/warnless.h index 27cf57c31..9ba650f20 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -28,6 +28,8 @@ unsigned char curlx_ultouc(unsigned long ulnum); int curlx_uztosi(size_t uznum); +unsigned long curlx_uztoul(size_t uznum); + int curlx_sltosi(long slnum); unsigned int curlx_sltoui(long slnum); -- cgit v1.2.1 From 8af4b657d0f44bd6f2b1d672666c046e53af0e0c Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 16 Mar 2012 19:06:34 +0100 Subject: fix some compiler warnings --- lib/warnless.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/warnless.h') diff --git a/lib/warnless.h b/lib/warnless.h index 9ba650f20..9f14e7865 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -40,6 +40,8 @@ ssize_t curlx_uztosz(size_t uznum); size_t curlx_sotouz(curl_off_t sonum); +int curlx_sztosi(ssize_t sznum); + size_t curlx_sitouz(int sinum); #if defined(__INTEL_COMPILER) && defined(__unix__) -- cgit v1.2.1 From c6825b7a6b5e8798bc861b3d280430e8149e7298 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 20 Mar 2012 18:28:24 +0100 Subject: fix several compiler warnings --- lib/warnless.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/warnless.h') diff --git a/lib/warnless.h b/lib/warnless.h index 9f14e7865..6040bee54 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -30,6 +30,8 @@ int curlx_uztosi(size_t uznum); unsigned long curlx_uztoul(size_t uznum); +unsigned int curlx_uztoui(size_t uznum); + int curlx_sltosi(long slnum); unsigned int curlx_sltoui(long slnum); -- cgit v1.2.1 From 9801596fb35f1e0c6e02eb3d5d6c9ad31fa70860 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sun, 25 Mar 2012 17:51:59 +0200 Subject: fix some compiler warnings --- lib/warnless.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/warnless.h') diff --git a/lib/warnless.h b/lib/warnless.h index 6040bee54..9d690d62c 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -26,6 +26,8 @@ unsigned short curlx_ultous(unsigned long ulnum); unsigned char curlx_ultouc(unsigned long ulnum); +int curlx_ultosi(unsigned long ulnum); + int curlx_uztosi(size_t uznum); unsigned long curlx_uztoul(size_t uznum); -- cgit v1.2.1