cvs commit: httpd-apreq/c apache_request.h

[jo...@apache.org]

joes        2003/07/10 04:08:50

  Modified:    .        Changes
               Request  Request.pm
               c        apache_request.h
  Log:
  Apply Graham Clark's macro cleanups and fixed missing doc credits for Steve Hay.
  
  Revision  Changes    Path
  1.57      +5 -0      httpd-apreq/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/Changes,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- Changes	5 Jul 2003 17:55:39 -0000	1.56
  +++ Changes	10 Jul 2003 11:08:50 -0000	1.57
  @@ -2,6 +2,11 @@
   
   =over 4
   
  +=item 1.23 - July 10, 2003
  +
  +Applied Graham Clark's patch to cleanup apache_request.h macros.
  +Added missing doc credits for Steve Hay in Request.pm. [joes]
  +
   =item 1.22 - July 5, 2003
   
   Open uploaded files with binary mode (relevant for Perl > 5.7),
  
  
  
  1.25      +2 -1      httpd-apreq/Request/Request.pm
  
  Index: Request.pm
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/Request/Request.pm,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Request.pm	1 May 2003 15:21:33 -0000	1.24
  +++ Request.pm	10 Jul 2003 11:08:50 -0000	1.25
  @@ -399,4 +399,5 @@
   
   =head1 AUTHOR
   
  -Doug MacEachern, updated for v1.0 by Joe Schaefer
  +Doug MacEachern, updated for v1.0 by Joe Schaefer, updated for v1.2 by
  +Steve Hay.
  
  
  
  1.11      +13 -13    httpd-apreq/c/apache_request.h
  
  Index: apache_request.h
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/c/apache_request.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- apache_request.h	27 Feb 2003 20:03:58 -0000	1.10
  +++ apache_request.h	10 Jul 2003 11:08:50 -0000	1.11
  @@ -60,19 +60,19 @@
   };
   
   #ifndef strEQ
  -#define strEQ(s1,s2) (!strcmp(s1,s2))
  +#define strEQ(s1,s2) (!strcmp((s1),(s2)))
   #endif
   
   #ifndef strEQN
  -#define strEQN(s1,s2,n) (!strncmp(s1,s2,n))
  +#define strEQN(s1,s2,n) (!strncmp((s1),(s2),(n)))
   #endif
   
   #ifndef strcaseEQ
  -#define strcaseEQ(s1,s2) (!strcasecmp(s1,s2))
  +#define strcaseEQ(s1,s2) (!strcasecmp((s1),(s2)))
   #endif
   
   #ifndef strncaseEQ
  -#define strncaseEQ(s1,s2,n) (!strncasecmp(s1,s2,n))
  +#define strncaseEQ(s1,s2,n) (!strncasecmp((s1),(s2),(n)))
   #endif
   
   #define DEFAULT_TABLE_NELTS 10
  @@ -97,7 +97,7 @@
   char *ApacheRequest_params_as_string(ApacheRequest *req, const char *key);
   int ApacheRequest___parse(ApacheRequest *req);
   #define ApacheRequest_parse(req) \
  -    (req->status = req->parsed ? req->status : ApacheRequest___parse(req)) 
  +    ((req)->status = (req)->parsed ? (req)->status : ApacheRequest___parse(req)) 
   table *ApacheRequest_query_params(ApacheRequest *req, ap_pool *p);
   table *ApacheRequest_post_params(ApacheRequest *req, ap_pool *p);
   
  @@ -106,20 +106,20 @@
   ApacheUpload *ApacheUpload_find(ApacheUpload *upload, char *name);
   
   #define ApacheRequest_upload(req) \
  -    ((req->parsed || (ApacheRequest_parse(req) == OK)) ? req->upload : NULL)
  +    (((req)->parsed || (ApacheRequest_parse(req) == OK)) ? (req)->upload : NULL)
   
  -#define ApacheUpload_FILE(upload) (upload->fp)
  +#define ApacheUpload_FILE(upload) ((upload)->fp)
   
  -#define ApacheUpload_size(upload) (upload->size)
  +#define ApacheUpload_size(upload) ((upload)->size)
   
   #define ApacheUpload_info(upload, key) \
  -ap_table_get(upload->info, key)
  +ap_table_get((upload)->info, (key))
   
   #define ApacheUpload_type(upload) \
  -ApacheUpload_info(upload, "Content-Type")
  +ApacheUpload_info((upload), "Content-Type")
   
  -#define ApacheRequest_set_post_max(req, max) (req->post_max = max)
  -#define ApacheRequest_set_temp_dir(req, dir) (req->temp_dir = dir)
  +#define ApacheRequest_set_post_max(req, max) ((req)->post_max = (max))
  +#define ApacheRequest_set_temp_dir(req, dir) ((req)->temp_dir = (dir))
   
   char *ApacheUtil_expires(pool *p, char *time_str, int type);
   #define EXPIRES_HTTP   1
  @@ -133,7 +133,7 @@
   #define REQ_ERROR APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, req->r
   
   #ifdef REQDEBUG
  -#define REQ_DEBUG(a) a
  +#define REQ_DEBUG(a) (a)
   #else
   #define REQ_DEBUG(a)
   #endif