generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hushing up more warnings

Browse Source
This commit is contained in:
Daniel Stenberg 2005-03-14 15:51:10 +00:00
parent 3916d1e6cb
commit ec4e653c6f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/http_ntlm.c
View File

@ -412,15 +412,15 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
*/ */
ntlm->p_identity = &ntlm->identity; ntlm->p_identity = &ntlm->identity;
memset(ntlm->p_identity, 0, sizeof(*ntlm->p_identity)); memset(ntlm->p_identity, 0, sizeof(*ntlm->p_identity));
if ((ntlm->identity.User = strdup(user)) == NULL) if ((ntlm->identity.User = (unsigned char *)strdup(user)) == NULL)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
ntlm->identity.UserLength = strlen(user); ntlm->identity.UserLength = strlen(user);
if ((ntlm->identity.Password = strdup(passwdp)) == NULL) if ((ntlm->identity.Password = (unsigned char *)strdup(passwdp)) == NULL)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
ntlm->identity.PasswordLength = strlen(passwdp); ntlm->identity.PasswordLength = strlen(passwdp);
if ((ntlm->identity.Domain = malloc(domlen+1)) == NULL) if ((ntlm->identity.Domain = malloc(domlen+1)) == NULL)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
strncpy(ntlm->identity.Domain, domain, domlen); strncpy((char *)ntlm->identity.Domain, domain, domlen);
ntlm->identity.Domain[domlen] = '\0'; ntlm->identity.Domain[domlen] = '\0';
ntlm->identity.DomainLength = domlen; ntlm->identity.DomainLength = domlen;
ntlm->identity.Flags = SEC_WINNT_AUTH_IDENTITY_ANSI; ntlm->identity.Flags = SEC_WINNT_AUTH_IDENTITY_ANSI;
@ -430,7 +430,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
} }
if (AcquireCredentialsHandle( if (AcquireCredentialsHandle(
NULL, "NTLM", SECPKG_CRED_OUTBOUND, NULL, ntlm->p_identity, NULL, (char *)"NTLM", SECPKG_CRED_OUTBOUND, NULL, ntlm->p_identity,
NULL, NULL, &ntlm->handle, NULL NULL, NULL, &ntlm->handle, NULL
) != SEC_E_OK) { ) != SEC_E_OK) {
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;

4
lib/if2ip.c
View File

@ -31,6 +31,8 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include "if2ip.h"
#if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN32__) && \ #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN32__) && \
!defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE)
@ -55,7 +57,6 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif #endif
/* -- if2ip() -- */
#ifdef HAVE_NETDB_H #ifdef HAVE_NETDB_H
#include <netdb.h> #include <netdb.h>
#endif #endif
@ -72,7 +73,6 @@
#include <inet.h> #include <inet.h>
#endif #endif
#include "if2ip.h"
#include "memory.h" #include "memory.h"
/* The last #include file should be: */ /* The last #include file should be: */