cvs commit: modperl-2.0/xs/Apache/Module Apache__Module.h

[geoff]

geoff       2003/05/30 06:37:19

  Modified:    xs/Apache/Module Apache__Module.h
  Added:       xs/Apache/CmdParms Apache__CmdParms.h
  Log:
  implement $parms->info.  directive handlers should now be complete.
  
  Revision  Changes    Path
  1.1                  modperl-2.0/xs/Apache/CmdParms/Apache__CmdParms.h
  
  Index: Apache__CmdParms.h
  ===================================================================
  #include "modperl_module.h"
  
  static MP_INLINE SV *mpxs_Apache__CmdParms_info(pTHX_ cmd_parms *cmd_parms)
  {
      const char *data = ((modperl_module_cmd_data_t *)cmd_parms->info)->cmd_data;
  
      if (data) {
          return newSVpv(data, 0);
      }
  
      return &PL_sv_undef;    
  }
  
  
  
  1.9       +1 -37     modperl-2.0/xs/Apache/Module/Apache__Module.h
  
  Index: Apache__Module.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/Apache/Module/Apache__Module.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Apache__Module.h  12 Dec 2002 08:43:38 -0000      1.8
  +++ Apache__Module.h  30 May 2003 13:37:19 -0000      1.9
  @@ -44,41 +44,5 @@
                                                       server_rec *s,
                                                       ap_conf_vector_t *v)
   {
  -    MP_dSCFG(s);
  -    module *modp;
  -    const char *name;
  -    void *ptr;
  -    PTR_TBL_t *table;
  -    SV *obj;
  -
  -    if (!v) {
  -        v = s->module_config;
  -    }
  -
  -    if (SvROK(pmodule)) {
  -        name = SvCLASS(pmodule);
  -    }
  -    else {
  -        STRLEN n_a;
  -        name = SvPV(pmodule, n_a);
  -    }
  -
  -    if (!(scfg->modules &&
  -          (modp = apr_hash_get(scfg->modules, name, APR_HASH_KEY_STRING)))) {
  -        return &PL_sv_undef;
  -    }
  -
  -    if (!(ptr = ap_get_module_config(v, modp))) {
  -        return &PL_sv_undef;
  -    }
  -
  -    if (!(table = modperl_module_config_table_get(aTHX_ FALSE))) {
  -        return &PL_sv_undef;
  -    }
  -
  -    if (!(obj = modperl_svptr_table_fetch(aTHX_ table, ptr))) {
  -        return &PL_sv_undef;
  -    }
  -
  -    return SvREFCNT_inc(obj);
  +    return modperl_get_config(aTHX_ pmodule, s, v);
   }