From b35d72ac668c52ef0755cedba89bdca54bd995ac Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sun, 6 Dec 1998 11:59:18 +0000 Subject: Name cleanups as suggested by Pavel: - cfg_strcpy() -> cfg_strdup() - mempool -> linpool, mp_* -> lp_* [to avoid confusion with memblock, mb_*] Anyway, it might be better to stop ranting about names and do some *real* work. --- conf/cf-lex.l | 6 +++--- conf/conf.h | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'conf') diff --git a/conf/cf-lex.l b/conf/cf-lex.l index eb1d3300..f608a3d3 100644 --- a/conf/cf-lex.l +++ b/conf/cf-lex.l @@ -38,7 +38,7 @@ static int cf_hash(byte *c); static struct symbol *cf_find_sym(byte *c, unsigned int h0); pool *cfg_pool; -mempool *cfg_mem; +linpool *cfg_mem; int (*cf_read_hook)(byte *buf, unsigned int max); @@ -232,11 +232,11 @@ cf_allocate(void) if (cfg_pool) rfree(cfg_pool); cfg_pool = rp_new(&root_pool, "Config"); - cfg_mem = mp_new(cfg_pool, 1024); + cfg_mem = lp_new(cfg_pool, 1024); } char * -cfg_strcpy(char *c) +cfg_strdup(char *c) { int l = strlen(c) + 1; char *z = cfg_allocu(l); diff --git a/conf/conf.h b/conf/conf.h index 93d1edd7..974815a8 100644 --- a/conf/conf.h +++ b/conf/conf.h @@ -14,12 +14,12 @@ /* Pools */ extern pool *cfg_pool; -extern mempool *cfg_mem; +extern linpool *cfg_mem; -#define cfg_alloc(size) mp_alloc(cfg_mem, size) -#define cfg_allocu(size) mp_allocu(cfg_mem, size) -#define cfg_allocz(size) mp_allocz(cfg_mem, size) -char *cfg_strcpy(char *c); +#define cfg_alloc(size) lp_alloc(cfg_mem, size) +#define cfg_allocu(size) lp_allocu(cfg_mem, size) +#define cfg_allocz(size) lp_allocz(cfg_mem, size) +char *cfg_strdup(char *c); /* Lexer */ -- cgit v1.2.3