Ignore:
Timestamp:
Nov 27, 2012, 4:43:17 PM (13 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: updated trunk to 3.6.0

Location:
trunk/server
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/server

  • trunk/server/lib/zlib/contrib/minizip/miniunz.c

    r414 r745  
    537537
    538538        strncpy(filename_try, zipfilename,MAXFILENAME-1);
    539         /* strncpy doesnt append the trailing NULL, of the string is too long. */
     539        /* strncpy doesn't append the trailing NULL, if the string is too long. */
    540540        filename_try[ MAXFILENAME ] = '\0';
    541541

  • trunk/server/lib/zlib/contrib/minizip/minizip.c

    r414 r745  
    7878
    7979    strncpy(name, f,MAXFILENAME-1);
    80     /* strncpy doesnt append the trailing NULL, of the string is too long. */
     80    /* strncpy doesn't append the trailing NULL, if the string is too long. */
    8181    name[ MAXFILENAME ] = '\0';
    8282
    … …  
    254254        zipok = 1 ;
    255255        strncpy(filename_try, argv[zipfilenamearg],MAXFILENAME-1);
    256         /* strncpy doesnt append the trailing NULL, of the string is too long. */
     256        /* strncpy doesn't append the trailing NULL, if the string is too long. */
    257257        filename_try[ MAXFILENAME ] = '\0';
    258258

  • trunk/server/lib/zlib/contrib/minizip/unzip.c

    r414 r745  
    160160     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
    161161   for end of file.
    162    IN assertion: the stream s has been sucessfully opened for reading.
     162   IN assertion: the stream s has been successfully opened for reading.
    163163*/
    164164
    … …  
    296296/*
    297297   Compare two filename (fileName1,fileName2).
    298    If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
    299    If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
     298   If iCaseSensitivity = 1, comparison is case sensitive (like strcmp)
     299   If iCaseSensitivity = 2, comparison is not case sensitive (like strcmpi
    300300                                                                or strcasecmp)
    301    If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
     301   If iCaseSensitivity = 0, case sensitivity is default of your operating system
    302302        (like 1 on Unix, 2 on Windows)
    303303

  • trunk/server/lib/zlib/contrib/minizip/unzip.h

    r414 r745  
    125125/*
    126126   Compare two filename (fileName1,fileName2).
    127    If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
    128    If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
     127   If iCaseSensitivity = 1, comparison is case sensitive (like strcmp)
     128   If iCaseSensitivity = 2, comparison is not case sensitive (like strcmpi
    129129                                or strcasecmp)
    130    If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
     130   If iCaseSensitivity = 0, case sensitivity is default of your operating system
    131131    (like 1 on Unix, 2 on Windows)
    132132*/

  • trunk/server/lib/zlib/contrib/minizip/zip.c

    r414 r745  
    100100  uLong  avail_in_this_block;
    101101  uLong  filled_in_this_block;
    102   uLong  unused; /* for future use and alignement */
     102  uLong  unused; /* for future use and alignment */
    103103  unsigned char data[SIZEDATA_INDATABLOCK];
    104104} linkedlist_datablock_internal;
    … …  
    118118
    119119    uLong pos_local_header;     /* offset of the local header of the file
    120                                      currenty writing */
     120                                     currently writing */
    121121    char* central_header;       /* central header data for the current file */
    122122    uLong size_centralheader;   /* size of the central header for cur file */
    123123    uLong flag;                 /* flag of the file currently writing */
    124124
    125     int  method;                /* compression method of file currenty wr.*/
     125    int  method;                /* compression method of file currently wr.*/
    126126    int  raw;                   /* 1 for directly writing raw data */
    127127    Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/
Note: See TracChangeset for help on using the changeset viewer.