From 59302080026cafb7ea0e0c802d5d550a79367a11 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 4 Sep 2006 07:00:58 +0000 Subject: [PATCH] Rename functions to avoid conflicts with libc. --- sys/emulation/ndis/kern_ndis.c | 8 ++++---- sys/kern/kern_firmware.c | 4 ++-- sys/kern/kern_objcache.c | 4 ++-- sys/kern/kern_slaballoc.c | 4 ++-- sys/sys/malloc.h | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/emulation/ndis/kern_ndis.c b/sys/emulation/ndis/kern_ndis.c index 0f36804522..b25941a93c 100644 --- a/sys/emulation/ndis/kern_ndis.c +++ b/sys/emulation/ndis/kern_ndis.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.57 2004/07/11 00:19:30 wpaul Exp $ - * $DragonFly: src/sys/emulation/ndis/kern_ndis.c,v 1.9 2005/12/31 23:35:40 dillon Exp $ + * $DragonFly: src/sys/emulation/ndis/kern_ndis.c,v 1.10 2006/09/04 07:00:56 dillon Exp $ */ #include @@ -656,12 +656,12 @@ ndis_add_sysctl(void *arg, char *key, char *desc, char *val, int flag) sc = arg; cfg = malloc(sizeof(struct ndis_cfglist), M_DEVBUF, M_WAITOK|M_ZERO); - cfg->ndis_cfg.nc_cfgkey = strdup(key, M_DEVBUF); + cfg->ndis_cfg.nc_cfgkey = kstrdup(key, M_DEVBUF); if (desc == NULL) { snprintf(descstr, sizeof(descstr), "%s (dynamic)", key); - cfg->ndis_cfg.nc_cfgdesc = strdup(descstr, M_DEVBUF); + cfg->ndis_cfg.nc_cfgdesc = kstrdup(descstr, M_DEVBUF); } else - cfg->ndis_cfg.nc_cfgdesc = strdup(desc, M_DEVBUF); + cfg->ndis_cfg.nc_cfgdesc = kstrdup(desc, M_DEVBUF); strcpy(cfg->ndis_cfg.nc_val, val); TAILQ_INSERT_TAIL(&sc->ndis_cfglist_head, cfg, link); diff --git a/sys/kern/kern_firmware.c b/sys/kern/kern_firmware.c index 856c1f7211..f224e571c1 100644 --- a/sys/kern/kern_firmware.c +++ b/sys/kern/kern_firmware.c @@ -30,7 +30,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/kern/kern_firmware.c,v 1.3 2005/07/06 05:59:39 dillon Exp $ + * $DragonFly: src/sys/kern/kern_firmware.c,v 1.4 2006/09/04 07:00:58 dillon Exp $ */ #include @@ -106,7 +106,7 @@ firmware_prepare_image(const char *imgname, size_t imglen) int error; img = malloc(sizeof(*img), M_DEVBUF, M_WAITOK | M_ZERO); - img->fw_name = strdup(imgname, M_DEVBUF); /* XXX necessary? */ + img->fw_name = kstrdup(imgname, M_DEVBUF); /* XXX necessary? */ img->fw_refcnt = 1; img->fw_imglen = imglen; diff --git a/sys/kern/kern_objcache.c b/sys/kern/kern_objcache.c index b4463e8518..10c39f1a39 100644 --- a/sys/kern/kern_objcache.c +++ b/sys/kern/kern_objcache.c @@ -29,7 +29,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/kern/kern_objcache.c,v 1.8 2006/08/23 06:45:39 dillon Exp $ + * $DragonFly: src/sys/kern/kern_objcache.c,v 1.9 2006/09/04 07:00:58 dillon Exp $ */ #include @@ -166,7 +166,7 @@ objcache_create(const char *name, int cluster_limit, int mag_capacity, /* allocate object cache structure */ oc = malloc(__offsetof(struct objcache, cache_percpu[ncpus]), M_OBJCACHE, M_WAITOK | M_ZERO); - oc->name = strdup(name, M_TEMP); + oc->name = kstrdup(name, M_TEMP); oc->ctor = ctor; oc->dtor = dtor; oc->private = private; diff --git a/sys/kern/kern_slaballoc.c b/sys/kern/kern_slaballoc.c index 9ca6262bff..6938027feb 100644 --- a/sys/kern/kern_slaballoc.c +++ b/sys/kern/kern_slaballoc.c @@ -33,7 +33,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/kern/kern_slaballoc.c,v 1.38 2006/05/24 03:23:31 dillon Exp $ + * $DragonFly: src/sys/kern/kern_slaballoc.c,v 1.39 2006/09/04 07:00:58 dillon Exp $ * * This module implements a slab allocator drop-in replacement for the * kernel malloc(). @@ -749,7 +749,7 @@ realloc(void *ptr, unsigned long size, struct malloc_type *type, int flags) * (MP SAFE) (MAY BLOCK) */ char * -strdup(const char *str, struct malloc_type *type) +kstrdup(const char *str, struct malloc_type *type) { int zlen; /* length inclusive of terminating NUL */ char *nstr; diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h index 43907546c6..7facd808ee 100644 --- a/sys/sys/malloc.h +++ b/sys/sys/malloc.h @@ -32,7 +32,7 @@ * * @(#)malloc.h 8.5 (Berkeley) 5/3/95 * $FreeBSD: src/sys/sys/malloc.h,v 1.48.2.2 2002/03/16 02:19:16 archie Exp $ - * $DragonFly: src/sys/sys/malloc.h,v 1.22 2006/05/21 03:43:47 dillon Exp $ + * $DragonFly: src/sys/sys/malloc.h,v 1.23 2006/09/04 07:00:58 dillon Exp $ */ #ifndef _SYS_MALLOC_H_ @@ -209,7 +209,7 @@ void *realloc (void *addr, unsigned long size, struct malloc_type *type, int flags); void *reallocf (void *addr, unsigned long size, struct malloc_type *type, int flags); -char *strdup (const char *, struct malloc_type *); +char *kstrdup (const char *, struct malloc_type *); #endif /* _KERNEL */ -- 2.41.0