httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/standard mod_include.h mod_include.c
Date Mon, 27 Nov 2000 21:03:33 GMT
trawick     00/11/27 13:03:23

  Modified:    src/modules/standard mod_include.h mod_include.c
  Log:
  fix a bunch of apr_ssize_t/apr_size_t discrepancies
  
  Revision  Changes    Path
  1.2       +1 -1      apache-2.0/src/modules/standard/mod_include.h
  
  Index: mod_include.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_include.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mod_include.h	2000/11/22 19:49:20	1.1
  +++ mod_include.h	2000/11/27 21:03:08	1.2
  @@ -183,7 +183,7 @@
   
   #define CREATE_ERROR_BUCKET(cntx, t_buck, h_ptr, ins_head)        \
   {                                                                 \
  -    apr_ssize_t e_wrt;                                            \
  +    apr_size_t e_wrt;                                             \
       t_buck = ap_bucket_create_heap(cntx->error_str,               \
                                      ctx->error_length, 1, &e_wrt); \
       AP_BUCKET_INSERT_BEFORE(h_ptr, t_buck);                       \
  
  
  
  1.78      +8 -8      apache-2.0/src/modules/standard/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_include.c,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- mod_include.c	2000/11/26 04:47:36	1.77
  +++ mod_include.c	2000/11/27 21:03:11	1.78
  @@ -165,7 +165,7 @@
   static ap_bucket *find_start_sequence(ap_bucket *dptr, include_ctx_t *ctx,
                                         ap_bucket_brigade *bb, int *do_cleanup)
   {
  -    apr_ssize_t len;
  +    apr_size_t len;
       const char *c;
       const char *buf;
       const char *str = STARTING_SEQUENCE;
  @@ -245,7 +245,7 @@
   
   static ap_bucket *find_end_sequence(ap_bucket *dptr, include_ctx_t *ctx, ap_bucket_brigade
*bb)
   {
  -    apr_ssize_t len;
  +    apr_size_t len;
       const char *c;
       const char *buf;
       const char *str = ENDING_SEQUENCE;
  @@ -344,7 +344,7 @@
       int         done = 0;
       ap_bucket  *dptr;
       const char *tmp_from;
  -    apr_ssize_t tmp_from_len;
  +    apr_size_t tmp_from_len;
   
       /* If the tag length is longer than the tmp buffer, allocate space. */
       if (ctx->tag_length > tmp_buf_size-1) {
  @@ -770,7 +770,7 @@
   
       rr_status = ap_run_sub_req(rr);
       if (ap_is_HTTP_REDIRECT(rr_status)) {
  -        apr_ssize_t len_loc, h_wrt;
  +        apr_size_t len_loc, h_wrt;
           const char *location = apr_table_get(rr->headers_out, "Location");
   
           location = ap_escape_html(rr->pool, location);
  @@ -1186,7 +1186,7 @@
       char       *tag_val   = NULL;
       const char *echo_text = NULL;
       ap_bucket  *tmp_buck;
  -    apr_ssize_t e_len, e_wrt;
  +    apr_size_t e_len, e_wrt;
       enum {E_NONE, E_URL, E_ENTITY} encode;
   
       encode = E_ENTITY;
  @@ -1455,7 +1455,7 @@
       char *tag     = NULL;
       char *tag_val = NULL;
       apr_finfo_t  finfo;
  -    apr_ssize_t  s_len, s_wrt;
  +    apr_size_t  s_len, s_wrt;
       ap_bucket   *tmp_buck;
       char parsed_string[MAX_STRING_LEN];
   
  @@ -1517,7 +1517,7 @@
       char *tag     = NULL;
       char *tag_val = NULL;
       apr_finfo_t  finfo;
  -    apr_ssize_t  t_len, t_wrt;
  +    apr_size_t  t_len, t_wrt;
       ap_bucket   *tmp_buck;
       char parsed_string[MAX_STRING_LEN];
   
  @@ -2647,7 +2647,7 @@
               apr_table_entry_t *elts = (apr_table_entry_t *)arr->elts;
               int i;
               char *key_text, *val_text;
  -            apr_ssize_t   k_len, v_len, t_wrt;
  +            apr_size_t   k_len, v_len, t_wrt;
   
               *inserted_head = NULL;
               for (i = 0; i < arr->nelts; ++i) {
  
  
  

Mime
View raw message