Commit 7e3f0bff authored by Yang Tse's avatar Yang Tse
Browse files

fix compiler warning: conversion may lose significant bits

parent 5d47bf37

lib/ftp.c

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static int ftp_endofresp(struct pingpong *pp, 
  size_t len = pp->nread_resp;



  if((len > 3) && LASTLINE(line)) {

    *code = strtol(line, NULL, 10);

    *code = curlx_sltosi(strtol(line, NULL, 10));

    return 1;

  }

  return 0;

lib/hostip.c

+2 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#include "strerror.h"

#include "url.h"

#include "inet_ntop.h"

#include "warnless.h"



#define _MPRINTF_REPLACE /* use our functions only */

#include <curl/mprintf.h>
@@ -597,7 +598,7 @@ int Curl_resolv_timeout(struct connectdata *conn, 


  /* alarm() makes a signal get sent when the timeout fires off, and that

     will abort system calls */

  prev_alarm = alarm((unsigned int) (timeout/1000L));

  prev_alarm = alarm(curlx_sltoui(timeout/1000L));



  /* This allows us to time-out from the name resolver, as the timeout

     will generate a signal and we will siglongjmp() from that here.

lib/parsedate.c

+2 −1
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 


#include <curl/curl.h>

#include "rawstr.h"

#include "warnless.h"

#include "parsedate.h"



const char * const Curl_wkday[] =
@@ -378,7 +379,7 @@ int Curl_parsedate(const char *date, time_t *output) 
        secnum = 0;

      }

      else {

        val = (int)strtol(date, &end, 10);

        val = curlx_sltosi(strtol(date, &end, 10));



        if((tzoff == -1) &&

           ((end - date) == 4) &&

lib/smtp.c

+2 −1
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ 
#include "curl_md5.h"

#include "curl_hmac.h"

#include "curl_gethostname.h"

#include "warnless.h"



#define _MPRINTF_REPLACE /* use our functions only */

#include <curl/mprintf.h>
@@ -226,7 +227,7 @@ static int smtp_endofresp(struct pingpong *pp, int *resp) 
    return FALSE;       /* Nothing for us. */



  if((result = line[3] == ' '))

    *resp = strtol(line, NULL, 10);

    *resp = curlx_sltosi(strtol(line, NULL, 10));



  line += 4;

  len -= 4;

lib/url.c

+18 −4
Original line number Diff line number Diff line
@@ -1006,7 +1006,21 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 
     * An FTP option that modifies an upload to create missing directories on

     * the server.

     */

    data->set.ftp_create_missing_dirs = (int)va_arg(param, long);

    switch(va_arg(param, long)) {

    case 0:

      data->set.ftp_create_missing_dirs = 0;

      break;

    case 1:

      data->set.ftp_create_missing_dirs = 1;

      break;

    case 2:

      data->set.ftp_create_missing_dirs = 2;

      break;

    default:

      /* reserve other values for future use */

      result = CURLE_FAILED_INIT;

      break;

    }

    break;

  case CURLOPT_SERVER_RESPONSE_TIMEOUT:

    /*
@@ -2001,13 +2015,13 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 
    /*

     * Set what local port to bind the socket to when performing an operation.

     */

    data->set.localport = (unsigned short) va_arg(param, long);

    data->set.localport = curlx_sltous(va_arg(param, long));

    break;

  case CURLOPT_LOCALPORTRANGE:

    /*

     * Set number of local ports to try, starting with CURLOPT_LOCALPORT.

     */

    data->set.localportrange = (int) va_arg(param, long);

    data->set.localportrange = curlx_sltosi(va_arg(param, long));

    break;

  case CURLOPT_KRBLEVEL:

    /*
@@ -2356,7 +2370,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 
     * know that an unsigned int will always hold the value so we blindly

     * typecast to this type

     */

    data->set.scope = (unsigned int) va_arg(param, long);

    data->set.scope = curlx_sltoui(va_arg(param, long));

    break;



  case CURLOPT_PROTOCOLS: