cvs commit: modperl-2.0/src/modules/perl modperl_env.c modperl_perl_global.c modperl_util.h

[dougm]

dougm       01/10/14 11:00:23

  Modified:    src/modules/perl modperl_env.c modperl_perl_global.c
                        modperl_util.h
  Log:
  add MP_SSTRLEN macro for improved readability over sizeof(s)-1
  
  Revision  Changes    Path
  1.16      +1 -1      modperl-2.0/src/modules/perl/modperl_env.c
  
  Index: modperl_env.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_env.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- modperl_env.c     2001/10/13 19:14:58     1.15
  +++ modperl_env.c     2001/10/14 18:00:23     1.16
  @@ -29,7 +29,7 @@
   } modperl_env_ent_t;
   
   #define MP_ENV_ENT(k,v) \
  -{ k, sizeof(k)-1, v, sizeof(v)-1, 0 }
  +{ k, MP_SSTRLEN(k), v, MP_SSTRLEN(v), 0 }
   
   static modperl_env_ent_t MP_env_const_vars[] = {
   #ifdef MP_COMPAT_1X
  
  
  
  1.13      +1 -1      modperl-2.0/src/modules/perl/modperl_perl_global.c
  
  Index: modperl_perl_global.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_perl_global.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- modperl_perl_global.c     2001/10/13 19:05:16     1.12
  +++ modperl_perl_global.c     2001/10/14 18:00:23     1.13
  @@ -19,7 +19,7 @@
   (HV*)*hv_store(PL_modglobal, gkey->val, gkey->len, (SV*)newHV(), gkey->hash)
   
   #define MP_MODGLOBAL_ENT(key) \
  -{key, "ModPerl::" key, (sizeof("ModPerl::")-1)+(sizeof(key)-1), 0}
  +{key, "ModPerl::" key, MP_SSTRLEN("ModPerl::") + MP_SSTRLEN(key), 0}
   
   static modperl_modglobal_key_t MP_modglobal_keys[] = {
       MP_MODGLOBAL_ENT("END"),
  
  
  
  1.27      +2 -0      modperl-2.0/src/modules/perl/modperl_util.h
  
  Index: modperl_util.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.h,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- modperl_util.h    2001/10/14 17:18:10     1.26
  +++ modperl_util.h    2001/10/14 18:00:23     1.27
  @@ -13,6 +13,8 @@
   #   define MP_FUNC_T(name)          (*name)
   #endif
   
  +#define MP_SSTRLEN(string) (sizeof(string)-1)
  +
   #ifndef strcaseEQ
   #   define strcaseEQ(s1,s2) (!strcasecmp(s1,s2))
   #endif