Changeset 528

Show
Ignore:
Timestamp:
12/20/06 01:04:47 (2 years ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/ChangeLog

    r527 r528  
     12006-12-19  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * cherokee/handler_admin.c (cherokee_handler_admin_init): Fixed 
     4        post lenght type. 
     5 
     6        * cherokee/post.h, cherokee/post.c (cherokee_post_get_len, 
     7        cherokee_post_set_len): size_t -> off_t 
     8 
     9        * cherokee/handler_fastcgi.h, cherokee/handler_fcgi.h, 
     10        cherokee/handler_scgi.h, cherokee/handler_scgi.c (build_header): 
     11        post_len property should be off_t. Fixed and set the right 
     12        fomating string parameter. 
     13 
     14        * cherokee/post.h: size, received and walk_offset type are now 
     15        off_t rather than size_t. 
     16 
     17        * cherokee/macros.h (FMT_SIZE, FMT_SIZE_HEX, CST_SIZE): Added new 
     18        macros to defize the format string of a size_t value. 
     19 
     20        * configure.in: Added check for the size of size_t, int and 
     21        unsigned int. 
     22 
    1232006-12-19  A.D.F  <adefacc@tin.it> 
    224 

  • cherokee/trunk/cget/main.c

    r260 r528  
    261261do_download (cherokee_downloader_t *downloader, cherokee_fdpoll_t *fdpoll) 
    262262{ 
    263         int   num; 
    264         ret_t ret; 
     263        ret_t                        ret; 
    265264        cherokee_downloader_status_t status; 
    266         int headers_are_read = 0; 
    267         int reading = 0; 
     265        cint_t                      headers_are_read = 0; 
     266        cint_t                       reading          = 0; 
    268267 
    269268        do_download__init(downloader,NULL); 

  • cherokee/trunk/cherokee/handler_admin.c

    r476 r528  
    124124{ 
    125125        char                    *tmp; 
    126         size_t                   postl; 
     126        offset_t                 postl; 
    127127        ret_t                    ret  = ret_ok; 
    128128        cherokee_buffer_t        post = CHEROKEE_BUF_INIT; 

  • cherokee/trunk/cherokee/handler_fastcgi.h

    r476 r528  
    6464        cuchar_t                        generation;      
    6565        cherokee_buffer_t               write_buffer;    
    66         size_t                          post_len; 
     66        off_t                           post_len; 
    6767 
    6868        cherokee_fcgi_manager_t        *manager; 

  • cherokee/trunk/cherokee/handler_fcgi.h

    r526 r528  
    4848        cherokee_socket_t             socket; 
    4949        cherokee_handler_fcgi_post_t  post_phase; 
    50         size_t                        post_len; 
     50        off_t                         post_len; 
    5151        cherokee_buffer_t             write_buffer; 
    5252} cherokee_handler_fcgi_t; 

  • cherokee/trunk/cherokee/handler_scgi.c

    r526 r528  
    240240        char    tmp[64]; 
    241241 
    242         len = snprintf (tmp, 64, FMT_OFFSET, hdl->post_len); 
     242        len = snprintf (tmp, sizeof(tmp), FMT_OFFSET, hdl->post_len); 
    243243         
    244244        set_env (HDL_CGI_BASE(hdl), "CONTENT_LENGTH", tmp, len); 

  • cherokee/trunk/cherokee/handler_scgi.h

    r476 r528  
    4747        cherokee_buffer_t            header; 
    4848        cherokee_socket_t            socket; 
    49         size_t                       post_len; 
     49        off_t                        post_len; 
    5050} cherokee_handler_scgi_t; 
    5151 

  • cherokee/trunk/cherokee/macros.h

    r489 r528  
    233233 
    234234 
    235 /* Format string for off_t 
     235/* Format string for off_t and size_t 
    236236 */ 
    237237#if (SIZEOF_OFF_T == SIZEOF_UNSIGNED_LONG_LONG) 
    …… 
    239239# define FMT_OFFSET_HEX "%llx" 
    240240# define CST_OFFSET unsigned long long 
    241 #elif (SIZEOF_OFF_T == SIZEOF_UNSIGNED_LONG) 
     241#elif (SIZEOF_OFF_T == SIZEOF_UNSIGNED_LONG) 
    242242# define FMT_OFFSET "%lu" 
    243243# define FMT_OFFSET_HEX "%lx" 
    …… 
    245245#else 
    246246# error Unknown size of off_t  
     247#endif 
     248 
     249#if (SIZEOF_SIZE_T == SIZEOF_UNSIGNED_INT) 
     250# define FMT_SIZE "%d" 
     251# define FMT_SIZE_HEX "%x" 
     252# define CST_SIZE unsigned int 
     253#elif (SIZEOF_SIZE_T == SIZEOF_UNSIGNED_LONG_LONG) 
     254# define FMT_SIZE "%llu" 
     255# define FMT_SIZE_HEX "%llx" 
     256# define CST_SIZE unsigned long long 
     257#else 
     258# error Unknown size of size_t  
    247259#endif 
    248260 

  • cherokee/trunk/cherokee/post.c

    r475 r528  
    7575 
    7676ret_t  
    77 cherokee_post_set_len (cherokee_post_t *post, size_t len) 
     77cherokee_post_set_len (cherokee_post_t *post, offset_t len) 
    7878{ 
    7979        post->type = (len > POST_SIZE_TO_DISK) ? post_in_tmp_file : post_in_memory; 
    …… 
    119119 
    120120ret_t  
    121 cherokee_post_get_len (cherokee_post_t *post, size_t *len) 
     121cherokee_post_get_len (cherokee_post_t *post, offset_t *len) 
    122122{ 
    123123        *len = post->size; 

  • cherokee/trunk/cherokee/post.h

    r256 r528  
    4040typedef struct { 
    4141        cherokee_post_type_t type; 
    42         size_t               size; 
    43         size_t               received; 
    44         size_t               walk_offset; 
     42        off_t                size; 
     43        off_t                received; 
     44        off_t                walk_offset; 
    4545 
    4646        cherokee_buffer_t    info; 
    …… 
    5454 
    5555 
    56 ret_t cherokee_post_init         (cherokee_post_t *post); 
    57 ret_t cherokee_post_mrproper     (cherokee_post_t *post); 
     56ret_t cherokee_post_init          (cherokee_post_t *post); 
     57ret_t cherokee_post_mrproper      (cherokee_post_t *post); 
    5858 
    59 int   cherokee_post_is_empty     (cherokee_post_t *post); 
    60 int   cherokee_post_got_all      (cherokee_post_t *post); 
     59int   cherokee_post_is_empty      (cherokee_post_t *post); 
     60int   cherokee_post_got_all      (cherokee_post_t *post); 
    6161 
    62 ret_t cherokee_post_set_len      (cherokee_post_t *post, size_t  len); 
    63 ret_t cherokee_post_get_len      (cherokee_post_t *post, size_t *len); 
     62ret_t cherokee_post_set_len      (cherokee_post_t *post, offset_t  len); 
     63ret_t cherokee_post_get_len      (cherokee_post_t *post, offset_t *len); 
    6464 
    65 ret_t cherokee_post_append       (cherokee_post_t *post, char *str, size_t len); 
    66 ret_t cherokee_post_commit_buf   (cherokee_post_t *post, size_t len); 
     65ret_t cherokee_post_append        (cherokee_post_t *post, char *str, size_t len); 
     66ret_t cherokee_post_commit_buf    (cherokee_post_t *post, size_t len); 
    6767 
    6868ret_t cherokee_post_walk_reset    (cherokee_post_t *post); 

  • cherokee/trunk/configure.in

    r522 r528  
    216216AC_TYPE_PID_T 
    217217AC_STRUCT_ST_RDEV 
    218 AC_CHECK_TYPE(ino_t,unsigned) 
    219 AC_CHECK_TYPE(loff_t,off_t) 
    220 AC_CHECK_TYPE(offset_t,loff_t) 
     218AC_CHECK_TYPE(ino_t, unsigned) 
     219AC_CHECK_TYPE(loff_t, off_t) 
     220AC_CHECK_TYPE(offset_t, loff_t) 
    221221AC_CHECK_TYPE(ssize_t, int) 
    222222AC_CHECK_TYPE(wchar_t, unsigned short) 
    223223 
     224AC_CHECK_SIZEOF(int) 
     225AC_CHECK_SIZEOF(unsigned int) 
    224226AC_CHECK_SIZEOF(unsigned long) 
    225227AC_CHECK_SIZEOF(unsigned long long) 
    226228AC_CHECK_SIZEOF(unsigned int) 
    227229AC_CHECK_SIZEOF(off_t) 
     230AC_CHECK_SIZEOF(size_t) 
    228231 
    229232AC_CACHE_CHECK([for long long],samba_cv_have_longlong,[