moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

fix compiler warning: comparison between signed and unsigned

Browse Source
This commit is contained in:
Yang Tse 2009-09-18 14:48:16 +00:00
parent 0fdb77d643
commit 61ea058d9f
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/setup.h
View File

@ -293,6 +293,7 @@
# define fstat(fdes,stp) _fstati64(fdes, stp) # define fstat(fdes,stp) _fstati64(fdes, stp)
# define stat(fname,stp) _stati64(fname, stp) # define stat(fname,stp) _stati64(fname, stp)
# define struct_stat struct _stati64 # define struct_stat struct _stati64
# define LSEEK_ERROR (__int64)-1
#endif #endif
/* /*
@ -307,12 +308,17 @@
# define fstat(fdes,stp) _fstat(fdes, stp) # define fstat(fdes,stp) _fstat(fdes, stp)
# define stat(fname,stp) _stat(fname, stp) # define stat(fname,stp) _stat(fname, stp)
# define struct_stat struct _stat # define struct_stat struct _stat
# define LSEEK_ERROR (long)-1
#endif #endif
#ifndef struct_stat #ifndef struct_stat
# define struct_stat struct stat # define struct_stat struct stat
#endif #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. * Default sizeof(off_t) in case it hasn't been defined in config file.
*/ */

12
src/main.c
View File

@ -218,6 +218,7 @@ typedef enum {
# define fstat(fdes,stp) _fstati64(fdes, stp) # define fstat(fdes,stp) _fstati64(fdes, stp)
# define stat(fname,stp) _stati64(fname, stp) # define stat(fname,stp) _stati64(fname, stp)
# define struct_stat struct _stati64 # define struct_stat struct _stati64
# define LSEEK_ERROR (__int64)-1
#endif #endif
/* /*
@ -232,12 +233,17 @@ typedef enum {
# define fstat(fdes,stp) _fstat(fdes, stp) # define fstat(fdes,stp) _fstat(fdes, stp)
# define stat(fname,stp) _stat(fname, stp) # define stat(fname,stp) _stat(fname, stp)
# define struct_stat struct _stat # define struct_stat struct _stat
# define LSEEK_ERROR (long)-1
#endif #endif
#ifndef struct_stat #ifndef struct_stat
# define struct_stat struct stat # define struct_stat struct stat
#endif #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. * 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 */ /* this code path doesn't support other types */
return 1; return 1;
if(-1 == lseek(in->fd, 0, SEEK_SET)) if(LSEEK_ERROR == lseek(in->fd, 0, SEEK_SET))
/* couldn't rewind to beginning */ /* couldn't rewind to beginning */
return 1; return 1;
while(left) { while(left) {
long step = (left>MAX_SEEK ? MAX_SEEK : (long)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 */ /* couldn't seek forwards the desired amount */
return 1; return 1;
left -= step; left -= step;
@ -3315,7 +3321,7 @@ static int my_seek(void *stream, curl_off_t offset, int whence)
return 0; return 0;
} }
#endif #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 /* 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 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. */ libcurl know that it may try other means if it wants to. */