perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
Date Thu, 30 May 2002 02:33:49 GMT
dougm       02/05/29 19:33:49

  Modified:    src/modules/perl modperl_filter.c modperl_filter.h
               xs/APR/Bucket APR__Bucket.h
               xs/Apache/RequestIO Apache__RequestIO.h
               xs/tables/current/ModPerl FunctionTable.pm
  Log:
  use apr_size_t rather than apr_ssize_t for apr_bucket_read
  (gets rid of some warnings on darwin)
  
  Revision  Changes    Path
  1.35      +10 -10    modperl-2.0/src/modules/perl/modperl_filter.c
  
  Index: modperl_filter.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- modperl_filter.c	6 Apr 2002 01:19:15 -0000	1.34
  +++ modperl_filter.c	30 May 2002 02:33:48 -0000	1.35
  @@ -3,7 +3,7 @@
   /* simple buffer api */
   
   MP_INLINE apr_status_t modperl_wbucket_pass(modperl_wbucket_t *wb,
  -                                            const char *buf, apr_ssize_t len)
  +                                            const char *buf, apr_size_t len)
   {
       apr_bucket_alloc_t *ba = (*wb->filters)->c->bucket_alloc;
       apr_bucket_brigade *bb;
  @@ -52,9 +52,9 @@
   
   MP_INLINE apr_status_t modperl_wbucket_write(modperl_wbucket_t *wb,
                                                const char *buf,
  -                                             apr_ssize_t *wlen)
  +                                             apr_size_t *wlen)
   {
  -    apr_ssize_t len = *wlen;
  +    apr_size_t len = *wlen;
       *wlen = 0;
   
       if ((len + wb->outcnt) > sizeof(wb->outbuf)) {
  @@ -226,13 +226,13 @@
       return 0;
   }
   
  -MP_INLINE apr_ssize_t modperl_output_filter_read(pTHX_
  -                                                 modperl_filter_t *filter,
  -                                                 SV *buffer,
  -                                                 apr_ssize_t wanted)
  +MP_INLINE apr_size_t modperl_output_filter_read(pTHX_
  +                                                modperl_filter_t *filter,
  +                                                SV *buffer,
  +                                                apr_size_t wanted)
   {
       int num_buckets = 0;
  -    apr_ssize_t len = 0;
  +    apr_size_t len = 0;
   
       (void)SvUPGRADE(buffer, SVt_PV);
       SvPOK_only(buffer);
  @@ -268,7 +268,7 @@
   
       while (1) {
           const char *buf;
  -        apr_ssize_t buf_len;
  +        apr_size_t buf_len;
   
           if (!get_bucket(filter)) {
               break;
  @@ -361,7 +361,7 @@
   
   MP_INLINE apr_status_t modperl_output_filter_write(modperl_filter_t *filter,
                                                      const char *buf,
  -                                                   apr_ssize_t *len)
  +                                                   apr_size_t *len)
   {
       return modperl_wbucket_write(&filter->wbucket, buf, len);
   }
  
  
  
  1.14      +7 -7      modperl-2.0/src/modules/perl/modperl_filter.h
  
  Index: modperl_filter.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- modperl_filter.h	6 Apr 2002 01:19:15 -0000	1.13
  +++ modperl_filter.h	30 May 2002 02:33:48 -0000	1.14
  @@ -12,13 +12,13 @@
   
   /* simple buffer api */
   MP_INLINE apr_status_t modperl_wbucket_pass(modperl_wbucket_t *b,
  -                                            const char *buf, apr_ssize_t len);
  +                                            const char *buf, apr_size_t len);
   
   MP_INLINE apr_status_t modperl_wbucket_flush(modperl_wbucket_t *b);
   
   MP_INLINE apr_status_t modperl_wbucket_write(modperl_wbucket_t *b,
                                                const char *buf,
  -                                             apr_ssize_t *wlen);
  +                                             apr_size_t *wlen);
   
   /* generic filter routines */
   
  @@ -43,14 +43,14 @@
   
   MP_INLINE apr_status_t modperl_output_filter_flush(modperl_filter_t *filter);
   
  -MP_INLINE apr_ssize_t modperl_output_filter_read(pTHX_
  -                                                 modperl_filter_t *filter,
  -                                                 SV *buffer,
  -                                                 apr_ssize_t wanted);
  +MP_INLINE apr_size_t modperl_output_filter_read(pTHX_
  +                                                modperl_filter_t *filter,
  +                                                SV *buffer,
  +                                                apr_size_t wanted);
   
   MP_INLINE apr_status_t modperl_output_filter_write(modperl_filter_t *filter,
                                                      const char *buf,
  -                                                   apr_ssize_t *len);
  +                                                   apr_size_t *len);
   
   void modperl_brigade_dump(apr_bucket_brigade *bb, FILE *fp);
   
  
  
  
  1.4       +1 -1      modperl-2.0/xs/APR/Bucket/APR__Bucket.h
  
  Index: APR__Bucket.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/APR/Bucket/APR__Bucket.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- APR__Bucket.h	7 Nov 2001 03:39:08 -0000	1.3
  +++ APR__Bucket.h	30 May 2002 02:33:48 -0000	1.4
  @@ -25,7 +25,7 @@
                                                          apr_read_type_e block)
   {
       int rc;
  -    apr_ssize_t len;
  +    apr_size_t len;
       const char *str;
   
       rc = modperl_bucket_read(bucket, &str, &len, block);
  
  
  
  1.27      +4 -4      modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h
  
  Index: Apache__RequestIO.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- Apache__RequestIO.h	10 May 2002 17:48:27 -0000	1.26
  +++ Apache__RequestIO.h	30 May 2002 02:33:48 -0000	1.27
  @@ -106,11 +106,11 @@
       mpxs_Apache__RequestRec_write(aTHX_ r, buffer, bufsiz, offset)
   
   static MP_INLINE
  -apr_ssize_t mpxs_Apache__RequestRec_write(pTHX_ request_rec *r,
  -                                          SV *buffer, apr_ssize_t bufsiz,
  -                                          int offset)
  +apr_size_t mpxs_Apache__RequestRec_write(pTHX_ request_rec *r,
  +                                         SV *buffer, apr_size_t bufsiz,
  +                                         int offset)
   {
  -    apr_ssize_t wlen = bufsiz;
  +    apr_size_t wlen = bufsiz;
       const char *buf;
       STRLEN svlen;
       MP_dRCFG;
  
  
  
  1.70      +7 -7      modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
  
  Index: FunctionTable.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- FunctionTable.pm	25 May 2002 18:36:36 -0000	1.69
  +++ FunctionTable.pm	30 May 2002 02:33:48 -0000	1.70
  @@ -2848,7 +2848,7 @@
       ]
     },
     {
  -    'return_type' => 'apr_ssize_t',
  +    'return_type' => 'apr_size_t',
       'name' => 'modperl_output_filter_read',
       'attr' => [
         '__inline__'
  @@ -2867,7 +2867,7 @@
           'name' => 'buffer'
         },
         {
  -        'type' => 'apr_ssize_t',
  +        'type' => 'apr_size_t',
           'name' => 'wanted'
         }
       ]
  @@ -2908,7 +2908,7 @@
           'name' => 'buf'
         },
         {
  -        'type' => 'apr_ssize_t *',
  +        'type' => 'apr_size_t *',
           'name' => 'len'
         }
       ]
  @@ -3889,7 +3889,7 @@
           'name' => 'buf'
         },
         {
  -        'type' => 'apr_ssize_t',
  +        'type' => 'apr_size_t',
           'name' => 'len'
         }
       ]
  @@ -3910,7 +3910,7 @@
           'name' => 'buf'
         },
         {
  -        'type' => 'apr_ssize_t *',
  +        'type' => 'apr_size_t *',
           'name' => 'wlen'
         }
       ]
  @@ -4726,7 +4726,7 @@
       ]
     },
     {
  -    'return_type' => 'apr_ssize_t',
  +    'return_type' => 'apr_size_t',
       'name' => 'mpxs_Apache__RequestRec_write',
       'args' => [
         {
  @@ -4742,7 +4742,7 @@
           'name' => 'buffer'
         },
         {
  -        'type' => 'apr_ssize_t',
  +        'type' => 'apr_size_t',
           'name' => 'bufsiz'
         },
         {
  
  
  

Mime
View raw message