Commit 91f2fb42 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Clean up namespace badness with s/configfile_t/ap_configfile_t/


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88312 13f79535-47bb-0310-9956-ffa450edef68
parent aa27b9b8

include/http_config.h

+16 −24
Original line number Diff line number Diff line
@@ -254,9 +254,9 @@ struct command_struct { 
 */

#define DECLINE_CMD "\a\b"



typedef struct configfile_t configfile_t;

typedef struct ap_configfile_t ap_configfile_t;

/** Common structure for reading of config files / passwd files etc. */

struct configfile_t {

struct ap_configfile_t {

    /** a getc()-like function

     *  @deffunc int getch(void *param) */

    int (*getch) (void *param);
@@ -290,7 +290,7 @@ struct cmd_parms_struct { 
    ap_method_list_t *xlimited;



    /** Config file structure. */

    configfile_t *config_file;

    ap_configfile_t *config_file;

    /** the directive specifying this command */

    ap_directive_t *directive;
@@ -593,55 +593,47 @@ AP_DECLARE(const char *) ap_find_module_name(module *m); 
AP_DECLARE(module *) ap_find_linked_module(const char *name);



/**

 * Open a configfile_t as apr_file_t

 * @param ret_cfg open configfile_t struct pointer

 * Open a ap_configfile_t as apr_file_t

 * @param ret_cfg open ap_configfile_t struct pointer

 * @param p The pool to allocate the structure out of

 * @param name the name of the file to open

 * @deffunc apr_status_t ap_pcfg_openfile(configfile_t **ret_cfg, apr_pool_t *p, const char *name)

 * @deffunc apr_status_t ap_pcfg_openfile(ap_configfile_t **ret_cfg, apr_pool_t *p, const char *name)

 */

AP_DECLARE(apr_status_t) ap_pcfg_openfile(configfile_t **ret_cfg, apr_pool_t *p, const char *name);

AP_DECLARE(apr_status_t) ap_pcfg_openfile(ap_configfile_t **ret_cfg, apr_pool_t *p, const char *name);



/**

 * Allocate a configfile_t handle with user defined functions and params 

 * Allocate a ap_configfile_t handle with user defined functions and params 

 * @param p The pool to allocate out of

 * @param descr The name of the file

 * @param param The argument passed to getch/getstr/close

 * @param getc_func The getch function

 * @param gets_func The getstr function

 * @param close_func The close function

 * @deffunc configfile_t *ap_pcfg_open_custom(apr_pool_t *p, const char *descr, void *param, int(*getc_func)(void*), void *(*gets_func) (void *buf, size_t bufsiz, void *param), int(*close_func)(void *param))

 * @deffunc ap_configfile_t *ap_pcfg_open_custom(apr_pool_t *p, const char *descr, void *param, int(*getc_func)(void*), void *(*gets_func) (void *buf, size_t bufsiz, void *param), int(*close_func)(void *param))

 */

AP_DECLARE(configfile_t *) ap_pcfg_open_custom(apr_pool_t *p, const char *descr,

AP_DECLARE(ap_configfile_t *) ap_pcfg_open_custom(apr_pool_t *p, const char *descr,

    void *param,

    int(*getc_func)(void*),

    void *(*gets_func) (void *buf, size_t bufsiz, void *param),

    int(*close_func)(void *param));



/**

 * Read one line from open configfile_t, strip LF, increase line number

 * Read one line from open ap_configfile_t, strip LF, increase line number

 * @param buf place to store the line read

 * @param bufsize size of the buffer

 * @param cfp File to read from

 * @return 1 on success, 0 on failure

 * @deffunc int ap_cfg_getline(char *buf, size_t bufsize, configfile_t *cfp)

 * @deffunc int ap_cfg_getline(char *buf, size_t bufsize, ap_configfile_t *cfp)

 */

AP_DECLARE(int) ap_cfg_getline(char *buf, size_t bufsize, configfile_t *cfp);

AP_DECLARE(int) ap_cfg_getline(char *buf, size_t bufsize, ap_configfile_t *cfp);



/**

 * Read one char from open configfile_t, increase line number upon LF 

 * @param cfp The file to read from

 * @return the character read

 * @deffunc int ap_cfg_getc(configfile_t *cfp)

 */

AP_DECLARE(int) ap_cfg_getc(configfile_t *cfp);



/**

 * Detach from open configfile_t, calling the close handler

 * Detach from open ap_configfile_t, calling the close handler

 * @param cfp The file to close

 * @return 1 on sucess, 0 on failure

 * @deffunc int ap_cfg_closefile(configfile_t *cfp)

 * @deffunc int ap_cfg_closefile(ap_configfile_t *cfp)

 */

AP_DECLARE(int) ap_cfg_closefile(configfile_t *cfp);

AP_DECLARE(int) ap_cfg_closefile(ap_configfile_t *cfp);



/**

 * Read all data between the current <foo> and the matching </foo>.  All

modules/aaa/mod_auth.c

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ module AP_MODULE_DECLARE_DATA auth_module; 


static char *get_pw(request_rec *r, char *user, char *auth_pwfile)

{

    configfile_t *f;

    ap_configfile_t *f;

    char l[MAX_STRING_LEN];

    const char *rpw, *w;

    apr_status_t status;
@@ -154,7 +154,7 @@ static char *get_pw(request_rec *r, char *user, char *auth_pwfile) 


static apr_table_t *groups_for_user(apr_pool_t *p, char *user, char *grpfile)

{

    configfile_t *f;

    ap_configfile_t *f;

    apr_table_t *grps = apr_table_make(p, 15);

    apr_pool_t *sp;

    char l[MAX_STRING_LEN];

modules/aaa/mod_auth_digest.c

+2 −2
Original line number Diff line number Diff line
@@ -1340,7 +1340,7 @@ static void note_digest_auth_failure(request_rec *r, 
static const char *get_hash(request_rec *r, const char *user,

			    const char *realm, const char *auth_pwfile)

{

    configfile_t *f;

    ap_configfile_t *f;

    char l[MAX_STRING_LEN];

    const char *rpw;

    char *w, *x;
@@ -1775,7 +1775,7 @@ static int authenticate_digest_user(request_rec *r) 
static apr_table_t *groups_for_user(request_rec *r, const char *user,

			      const char *grpfile)

{

    configfile_t *f;

    ap_configfile_t *f;

    apr_table_t *grps = apr_table_make(r->pool, 15);

    apr_pool_t *sp;

    char l[MAX_STRING_LEN];

modules/http/mod_mime.c

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static apr_table_t *hash_buckets[MIME_HASHSIZE]; 


static void mime_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)

{

    configfile_t *f;

    ap_configfile_t *f;

    char l[MAX_STRING_LEN];

    int x;

    const char *types_confname = ap_get_module_config(s->module_config, &mime_module);

modules/mappers/mod_imap.c

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ static int imap_handler(request_rec *r) 
    char *imap_default;

    char *imap_base;



    configfile_t *imap; 

    ap_configfile_t *imap; 



    if (r->method_number != M_GET || (strcmp(r->handler,IMAP_MAGIC_TYPE)

				      && strcmp(r->handler, "imap-file")))