VirtualBox

Ignore:
Timestamp:
Jun 9, 2022 9:09:44 AM (3 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
151769
Message:

libs/zlib: Upgrade to 1.2.12, bugref:8515

Location:
trunk/src/libs/zlib-1.2.12
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/libs/zlib-1.2.12

    • Property svn:mergeinfo

      •  

        old new  
        2020/branches/dsen/gui3/src/libs/zlib-1.2.11:79645-79692
        2121/trunk/src/src/libs/zlib-1.2.11:92342
         22/vendor/zlib/1.2.12:151751
         23/vendor/zlib/current:150724-151750

  • trunk/src/libs/zlib-1.2.12/contrib/minizip/ioapi.c

    r76163 r95239  
    5959    else
    6060    {
    61         uLong tell_uLong = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
     61        uLong tell_uLong = (uLong)(*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
    6262        if ((tell_uLong) == MAXU32)
    6363            return (ZPOS64_T)-1;
    … …  
    9595static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
    9696{
     97    (void)opaque;
    9798    FILE* file = NULL;
    9899    const char* mode_fopen = NULL;
    … …  
    113114static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode)
    114115{
     116    (void)opaque;
    115117    FILE* file = NULL;
    116118    const char* mode_fopen = NULL;
    … …  
    132134static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
    133135{
     136    (void)opaque;
    134137    uLong ret;
    135138    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
    … …  
    139142static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
    140143{
     144    (void)opaque;
    141145    uLong ret;
    142146    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
    … …  
    146150static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
    147151{
     152    (void)opaque;
    148153    long ret;
    149154    ret = ftell((FILE *)stream);
    … …  
    154159static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
    155160{
     161    (void)opaque;
    156162    ZPOS64_T ret;
    157     ret = FTELLO_FUNC((FILE *)stream);
     163    ret = (ZPOS64_T)FTELLO_FUNC((FILE *)stream);
    158164    return ret;
    159165}
    … …  
    161167static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offset, int origin)
    162168{
     169    (void)opaque;
    163170    int fseek_origin=0;
    164171    long ret;
    … …  
    177184    }
    178185    ret = 0;
    179     if (fseek((FILE *)stream, offset, fseek_origin) != 0)
     186    if (fseek((FILE *)stream, (long)offset, fseek_origin) != 0)
    180187        ret = -1;
    181188    return ret;
    … …  
    184191static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T offset, int origin)
    185192{
     193    (void)opaque;
    186194    int fseek_origin=0;
    187195    long ret;
    … …  
    201209    ret = 0;
    202210
    203     if(FSEEKO_FUNC((FILE *)stream, offset, fseek_origin) != 0)
     211    if(FSEEKO_FUNC((FILE *)stream, (long)offset, fseek_origin) != 0)
    204212                        ret = -1;
    205213
    … …  
    210218static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
    211219{
     220    (void)opaque;
    212221    int ret;
    213222    ret = fclose((FILE *)stream);
    … …  
    217226static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
    218227{
     228    (void)opaque;
    219229    int ret;
    220230    ret = ferror((FILE *)stream);
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette