Commit 8676ce68 authored by Marc Hoersken's avatar Marc Hoersken
Browse files

lib: Fixed multiple code analysis warnings if SAL are available 

warning C28252: Inconsistent annotation for function:
parameter has another annotation on this instance
parent 91669584

lib/idn_win32.c

+25 −2
Original line number Diff line number Diff line
@@ -35,8 +35,31 @@ 
#include "memdebug.h"



#ifdef WANT_IDN_PROTOTYPES

WINBASEAPI int WINAPI IdnToAscii(DWORD, const WCHAR *, int, WCHAR *, int);

WINBASEAPI int WINAPI IdnToUnicode(DWORD, const WCHAR *, int, WCHAR *, int);

#  if defined(_SAL_VERSION)

WINNORMALIZEAPI int WINAPI

IdnToAscii(_In_                           DWORD    dwFlags,

           _In_reads_(cchUnicodeChar)     LPCWSTR  lpUnicodeCharStr,

           _In_                           int      cchUnicodeChar,

           _Out_writes_opt_(cchASCIIChar) LPWSTR   lpASCIICharStr,

           _In_                           int      cchASCIIChar);

WINNORMALIZEAPI int WINAPI

IdnToUnicode(_In_                             DWORD   dwFlags,

             _In_reads_(cchASCIIChar)         LPCWSTR lpASCIICharStr,

             _In_                             int     cchASCIIChar,

             _Out_writes_opt_(cchUnicodeChar) LPWSTR  lpUnicodeCharStr,

             _In_                             int     cchUnicodeChar);

#  else

WINBASEAPI int WINAPI IdnToAscii(DWORD dwFlags,

                                 const WCHAR *lpUnicodeCharStr,

                                 int cchUnicodeChar,

                                 WCHAR *lpASCIICharStr,

                                 int cchASCIIChar);

WINBASEAPI int WINAPI IdnToUnicode(DWORD dwFlags,

                                   const WCHAR *lpASCIICharStr,

                                   int cchASCIIChar,

                                   WCHAR *lpUnicodeCharStr,

                                   int cchUnicodeChar);

#  endif

#endif



#define IDN_MAX_LENGTH 255

lib/strtoofft.h

+8 −1
Original line number Diff line number Diff line
@@ -45,7 +45,14 @@ 
#    define curlx_strtoofft strtoll

#  else

#    if defined(_MSC_VER) && (_MSC_VER >= 1300) && (_INTEGRAL_MAX_BITS >= 64)

       _CRTIMP __int64 __cdecl _strtoi64(const char *, char **, int);

#      if defined(_SAL_VERSION)

         _Check_return_ _CRTIMP __int64 __cdecl _strtoi64(

             _In_z_ const char *_String,

             _Out_opt_ _Deref_post_z_ char **_EndPtr, _In_ int _Radix);

#      else

         _CRTIMP __int64 __cdecl _strtoi64(const char *_String,

                                           char **_EndPtr, int _Radix);

#      endif

#      define curlx_strtoofft _strtoi64

#    else

       curl_off_t curlx_strtoll(const char *nptr, char **endptr, int base);