Commit 61ea058d authored by Yang Tse's avatar Yang Tse
Browse files 

fix compiler warning: comparison between signed and unsigned
parent 0fdb77d6

lib/setup.h

+6 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ 
#  define fstat(fdes,stp)            _fstati64(fdes, stp)

#  define stat(fname,stp)            _stati64(fname, stp)

#  define struct_stat                struct _stati64

#  define LSEEK_ERROR                (__int64)-1

#endif



/*
@@ -307,12 +308,17 @@ 
#  define fstat(fdes,stp)            _fstat(fdes, stp)

#  define stat(fname,stp)            _stat(fname, stp)

#  define struct_stat                struct _stat

#  define LSEEK_ERROR                (long)-1

#endif



#ifndef struct_stat

#  define struct_stat struct stat

#endif



#ifndef LSEEK_ERROR

#  define LSEEK_ERROR (off_t)-1

#endif



/*

 * Default sizeof(off_t) in case it hasn't been defined in config file.

 */

src/main.c

+9 −3
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ typedef enum { 
#  define fstat(fdes,stp)            _fstati64(fdes, stp)

#  define stat(fname,stp)            _stati64(fname, stp)

#  define struct_stat                struct _stati64

#  define LSEEK_ERROR                (__int64)-1

#endif



/*
@@ -232,12 +233,17 @@ typedef enum { 
#  define fstat(fdes,stp)            _fstat(fdes, stp)

#  define stat(fname,stp)            _stat(fname, stp)

#  define struct_stat                struct _stat

#  define LSEEK_ERROR                (long)-1

#endif



#ifndef struct_stat

#  define struct_stat struct stat

#endif



#ifndef LSEEK_ERROR

#  define LSEEK_ERROR (off_t)-1

#endif



/*

 * Default sizeof(off_t) in case it hasn't been defined in config file.

 */
@@ -3301,13 +3307,13 @@ static int my_seek(void *stream, curl_off_t offset, int whence) 
      /* this code path doesn't support other types */

      return 1;



    if(-1 == lseek(in->fd, 0, SEEK_SET))

    if(LSEEK_ERROR == lseek(in->fd, 0, SEEK_SET))

      /* couldn't rewind to beginning */

      return 1;



    while(left) {

      long step = (left>MAX_SEEK ? MAX_SEEK : (long)left);

      if(-1 == lseek(in->fd, step, SEEK_CUR))

      if(LSEEK_ERROR == lseek(in->fd, step, SEEK_CUR))

        /* couldn't seek forwards the desired amount */

        return 1;

      left -= step;
@@ -3315,7 +3321,7 @@ static int my_seek(void *stream, curl_off_t offset, int whence) 
    return 0;

  }

#endif

  if(-1 == lseek(in->fd, offset, whence))

  if(LSEEK_ERROR == lseek(in->fd, offset, whence))

    /* couldn't rewind, the reason is in errno but errno is just not portable

       enough and we don't actually care that much why we failed. We'll let

       libcurl know that it may try other means if it wants to. */