Commit 52376766 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Fixed some minor mismatched types found by splint.

parent 327c0d6b

lib/dict.c

+3 −3
Original line number Diff line number Diff line
@@ -82,13 +82,13 @@ 
/* The last #include file should be: */

#include "memdebug.h"



static char *unescape_word(struct SessionHandle *data, char *inp)

static char *unescape_word(struct SessionHandle *data, const char *inp)

{

  char *newp;

  char *dictp;

  char *ptr;

  int len;

  unsigned char byte;

  char byte;

  int olen=0;



  newp = curl_easy_unescape(data, inp, 0, &len);
@@ -100,7 +100,7 @@ static char *unescape_word(struct SessionHandle *data, char *inp) 
    /* According to RFC2229 section 2.2, these letters need to be escaped with

       \[letter] */

    for(ptr = newp;

        (byte = (unsigned char)*ptr) != 0;

        (byte = *ptr) != 0;

        ptr++) {

      if ((byte <= 32) || (byte == 127) ||

          (byte == '\'') || (byte == '\"') || (byte == '\\')) {

lib/easy.c

+3 −2
Original line number Diff line number Diff line
@@ -886,7 +886,8 @@ CURLcode Curl_convert_from_utf8(struct SessionHandle *data, 
  } else {

#ifdef HAVE_ICONV

    /* do the translation ourselves */

    char *input_ptr, *output_ptr;

    const char *input_ptr;

    char *output_ptr;

    size_t in_bytes, out_bytes, rc;

    int error;
@@ -907,7 +908,7 @@ CURLcode Curl_convert_from_utf8(struct SessionHandle *data, 
    /* call iconv */

    input_ptr = output_ptr = buffer;

    in_bytes = out_bytes = length;

    rc = iconv(data->utf8_cd, (const char**)&input_ptr, &in_bytes,

    rc = iconv(data->utf8_cd, &input_ptr, &in_bytes,

               &output_ptr, &out_bytes);

    if ((rc == ICONV_ERROR) || (in_bytes != 0)) {

      error = ERRNO;

lib/escape.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ char *curl_easy_escape(CURL *handle, const char *string, int inlength) 
  size_t alloc = (inlength?(size_t)inlength:strlen(string))+1;

  char *ns;

  char *testing_ptr = NULL;

  unsigned char in;

  char in;

  size_t newlen = alloc;

  int strindex=0;

  size_t length;

lib/hostip.c

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ create_hostcache_id(const char *server, int port) 
}



struct hostcache_prune_data {

  int cache_timeout;

  long cache_timeout;

  time_t now;

};
@@ -232,7 +232,7 @@ hostcache_timestamp_remove(void *datap, void *hc) 
 * Prune the DNS cache. This assumes that a lock has already been taken.

 */

static void

hostcache_prune(struct curl_hash *hostcache, int cache_timeout, time_t now)

hostcache_prune(struct curl_hash *hostcache, long cache_timeout, time_t now)

{

  struct hostcache_prune_data user;

lib/http.c

+4 −4
Original line number Diff line number Diff line
@@ -1055,7 +1055,7 @@ CURLcode add_buffer(send_buffer *in, const void *inptr, size_t size) 
 * Pass headers WITH the colon.

 */

bool

Curl_compareheader(char *headerline,    /* line to check */

Curl_compareheader(const char *headerline, /* line to check */

                   const char *header,  /* header keyword _with_ colon */

                   const char *content) /* content string to find */

{
@@ -1067,8 +1067,8 @@ Curl_compareheader(char *headerline, /* line to check */ 
  size_t hlen = strlen(header);

  size_t clen;

  size_t len;

  char *start;

  char *end;

  const char *start;

  const char *end;



  if(!strnequal(headerline, header, hlen))

    return FALSE; /* doesn't start with header */
@@ -1119,7 +1119,7 @@ Curl_compareheader(char *headerline, /* line to check */ 
CURLcode Curl_proxyCONNECT(struct connectdata *conn,

                           int sockindex,

                           char *hostname,

                           int remote_port)

                           unsigned short remote_port)

{

  int subversion=0;

  struct SessionHandle *data=conn->data;