From 73f913ca547aaacbc471575df96196c84a90df22 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Sun, 3 Sep 2006 17:55:34 +0000 Subject: [PATCH] Rename functions to avoid conflicts with libc. --- sys/i386/i386/db_trace.c | 17 ++++++++-------- sys/i386/i386/sys_machdep.c | 30 ++++++++++++++-------------- sys/platform/pc32/i386/db_trace.c | 17 ++++++++-------- sys/platform/pc32/i386/sys_machdep.c | 30 ++++++++++++++-------------- 4 files changed, 46 insertions(+), 48 deletions(-) diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c index 02da02980d..6e5c0bce1f 100644 --- a/sys/i386/i386/db_trace.c +++ b/sys/i386/i386/db_trace.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/i386/i386/db_trace.c,v 1.35.2.3 2002/02/21 22:31:25 silby Exp $ - * $DragonFly: src/sys/i386/i386/Attic/db_trace.c,v 1.13 2006/05/25 07:36:33 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/db_trace.c,v 1.14 2006/09/03 17:55:34 dillon Exp $ */ #include @@ -113,9 +113,9 @@ static void db_print_stack_entry(const char *, int, char **, int *, db_addr_t); static char *watchtype_str(int type); -int i386_set_watch(int watchnum, unsigned int watchaddr, +static int ki386_set_watch(int watchnum, unsigned int watchaddr, int size, int access, struct dbreg * d); -int i386_clr_watch(int watchnum, struct dbreg * d); +static int ki386_clr_watch(int watchnum, struct dbreg * d); int db_md_set_watchpoint(db_expr_t addr, db_expr_t size); int db_md_clr_watchpoint(db_expr_t addr, db_expr_t size); void db_md_list_watchpoints(void); @@ -458,9 +458,8 @@ DB_DRX_FUNC(dr5) DB_DRX_FUNC(dr6) DB_DRX_FUNC(dr7) - -int -i386_set_watch(int watchnum, unsigned int watchaddr, int size, int access, +static int +ki386_set_watch(int watchnum, unsigned int watchaddr, int size, int access, struct dbreg *d) { int i; @@ -520,7 +519,7 @@ i386_set_watch(int watchnum, unsigned int watchaddr, int size, int access, int -i386_clr_watch(int watchnum, struct dbreg *d) +ki386_clr_watch(int watchnum, struct dbreg *d) { if (watchnum < 0 || watchnum >= 4) return(-1); @@ -558,7 +557,7 @@ db_md_set_watchpoint(db_expr_t addr, db_expr_t size) wsize = size; if (wsize == 3) wsize++; - i386_set_watch(i, addr, wsize, DBREG_DR7_WRONLY, &d); + ki386_set_watch(i, addr, wsize, DBREG_DR7_WRONLY, &d); addr += wsize; size -= wsize; } @@ -581,7 +580,7 @@ db_md_clr_watchpoint(db_expr_t addr, db_expr_t size) if (d.dr7 & (3 << (i * 2))) { if ((DBREG_DRX((&d), i) >= addr) && (DBREG_DRX((&d), i) < addr + size)) - i386_clr_watch(i, &d); + ki386_clr_watch(i, &d); } } diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c index d666c129c4..36c332eca7 100644 --- a/sys/i386/i386/sys_machdep.c +++ b/sys/i386/i386/sys_machdep.c @@ -32,7 +32,7 @@ * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 * $FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.47.2.3 2002/10/07 17:20:00 jhb Exp $ - * $DragonFly: src/sys/i386/i386/Attic/sys_machdep.c,v 1.24 2006/07/02 00:49:31 corecode Exp $ + * $DragonFly: src/sys/i386/i386/Attic/sys_machdep.c,v 1.25 2006/09/03 17:55:34 dillon Exp $ * */ @@ -69,10 +69,10 @@ -static int i386_get_ldt(struct lwp *, char *, int *); -static int i386_set_ldt(struct lwp *, char *, int *); -static int i386_get_ioperm(struct lwp *, char *); -static int i386_set_ioperm(struct lwp *, char *); +static int ki386_get_ldt(struct lwp *, char *, int *); +static int ki386_set_ldt(struct lwp *, char *, int *); +static int ki386_get_ioperm(struct lwp *, char *); +static int ki386_set_ioperm(struct lwp *, char *); static int check_descs(union descriptor *, int); int i386_extend_pcb(struct lwp *); @@ -88,16 +88,16 @@ sys_sysarch(struct sysarch_args *uap) switch(uap->op) { case I386_GET_LDT: - error = i386_get_ldt(lp, uap->parms, &uap->sysmsg_result); + error = ki386_get_ldt(lp, uap->parms, &uap->sysmsg_result); break; case I386_SET_LDT: - error = i386_set_ldt(lp, uap->parms, &uap->sysmsg_result); + error = ki386_set_ldt(lp, uap->parms, &uap->sysmsg_result); break; case I386_GET_IOPERM: - error = i386_get_ioperm(lp, uap->parms); + error = ki386_get_ioperm(lp, uap->parms); break; case I386_SET_IOPERM: - error = i386_set_ioperm(lp, uap->parms); + error = ki386_set_ioperm(lp, uap->parms); break; case I386_VM86: error = vm86_sysarch(lp, uap->parms); @@ -164,7 +164,7 @@ i386_extend_pcb(struct lwp *lp) } static int -i386_set_ioperm(struct lwp *lp, char *args) +ki386_set_ioperm(struct lwp *lp, char *args) { int i, error; struct i386_ioperm_args ua; @@ -202,7 +202,7 @@ i386_set_ioperm(struct lwp *lp, char *args) } static int -i386_get_ioperm(struct lwp *lp, char *args) +ki386_get_ioperm(struct lwp *lp, char *args) { int i, state, error; struct i386_ioperm_args ua; @@ -349,7 +349,7 @@ user_ldt_free(struct pcb *pcb) } static int -i386_get_ldt(struct lwp *lwp, char *args, int *res) +ki386_get_ldt(struct lwp *lwp, char *args, int *res) { int error = 0; struct pcb *pcb = lwp->lwp_thread->td_pcb; @@ -362,7 +362,7 @@ i386_get_ldt(struct lwp *lwp, char *args, int *res) return(error); #ifdef DEBUG - printf("i386_get_ldt: start=%d num=%d descs=%p\n", + printf("ki386_get_ldt: start=%d num=%d descs=%p\n", uap->start, uap->num, (void *)uap->descs); #endif @@ -395,7 +395,7 @@ i386_get_ldt(struct lwp *lwp, char *args, int *res) } static int -i386_set_ldt(struct lwp *lp, char *args, int *res) +ki386_set_ldt(struct lwp *lp, char *args, int *res) { int error = 0; int largest_ld; @@ -409,7 +409,7 @@ i386_set_ldt(struct lwp *lp, char *args, int *res) return(error); #ifdef DEBUG - printf("i386_set_ldt: start=%d num=%d descs=%p\n", + printf("ki386_set_ldt: start=%d num=%d descs=%p\n", uap->start, uap->num, (void *)uap->descs); #endif diff --git a/sys/platform/pc32/i386/db_trace.c b/sys/platform/pc32/i386/db_trace.c index 9f42d2ce9c..f2671a11e0 100644 --- a/sys/platform/pc32/i386/db_trace.c +++ b/sys/platform/pc32/i386/db_trace.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/i386/i386/db_trace.c,v 1.35.2.3 2002/02/21 22:31:25 silby Exp $ - * $DragonFly: src/sys/platform/pc32/i386/db_trace.c,v 1.13 2006/05/25 07:36:33 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/db_trace.c,v 1.14 2006/09/03 17:55:34 dillon Exp $ */ #include @@ -113,9 +113,9 @@ static void db_print_stack_entry(const char *, int, char **, int *, db_addr_t); static char *watchtype_str(int type); -int i386_set_watch(int watchnum, unsigned int watchaddr, +static int ki386_set_watch(int watchnum, unsigned int watchaddr, int size, int access, struct dbreg * d); -int i386_clr_watch(int watchnum, struct dbreg * d); +static int ki386_clr_watch(int watchnum, struct dbreg * d); int db_md_set_watchpoint(db_expr_t addr, db_expr_t size); int db_md_clr_watchpoint(db_expr_t addr, db_expr_t size); void db_md_list_watchpoints(void); @@ -458,9 +458,8 @@ DB_DRX_FUNC(dr5) DB_DRX_FUNC(dr6) DB_DRX_FUNC(dr7) - -int -i386_set_watch(int watchnum, unsigned int watchaddr, int size, int access, +static int +ki386_set_watch(int watchnum, unsigned int watchaddr, int size, int access, struct dbreg *d) { int i; @@ -520,7 +519,7 @@ i386_set_watch(int watchnum, unsigned int watchaddr, int size, int access, int -i386_clr_watch(int watchnum, struct dbreg *d) +ki386_clr_watch(int watchnum, struct dbreg *d) { if (watchnum < 0 || watchnum >= 4) return(-1); @@ -558,7 +557,7 @@ db_md_set_watchpoint(db_expr_t addr, db_expr_t size) wsize = size; if (wsize == 3) wsize++; - i386_set_watch(i, addr, wsize, DBREG_DR7_WRONLY, &d); + ki386_set_watch(i, addr, wsize, DBREG_DR7_WRONLY, &d); addr += wsize; size -= wsize; } @@ -581,7 +580,7 @@ db_md_clr_watchpoint(db_expr_t addr, db_expr_t size) if (d.dr7 & (3 << (i * 2))) { if ((DBREG_DRX((&d), i) >= addr) && (DBREG_DRX((&d), i) < addr + size)) - i386_clr_watch(i, &d); + ki386_clr_watch(i, &d); } } diff --git a/sys/platform/pc32/i386/sys_machdep.c b/sys/platform/pc32/i386/sys_machdep.c index d7db1cb93f..4a5d50b101 100644 --- a/sys/platform/pc32/i386/sys_machdep.c +++ b/sys/platform/pc32/i386/sys_machdep.c @@ -32,7 +32,7 @@ * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 * $FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.47.2.3 2002/10/07 17:20:00 jhb Exp $ - * $DragonFly: src/sys/platform/pc32/i386/sys_machdep.c,v 1.24 2006/07/02 00:49:31 corecode Exp $ + * $DragonFly: src/sys/platform/pc32/i386/sys_machdep.c,v 1.25 2006/09/03 17:55:34 dillon Exp $ * */ @@ -69,10 +69,10 @@ -static int i386_get_ldt(struct lwp *, char *, int *); -static int i386_set_ldt(struct lwp *, char *, int *); -static int i386_get_ioperm(struct lwp *, char *); -static int i386_set_ioperm(struct lwp *, char *); +static int ki386_get_ldt(struct lwp *, char *, int *); +static int ki386_set_ldt(struct lwp *, char *, int *); +static int ki386_get_ioperm(struct lwp *, char *); +static int ki386_set_ioperm(struct lwp *, char *); static int check_descs(union descriptor *, int); int i386_extend_pcb(struct lwp *); @@ -88,16 +88,16 @@ sys_sysarch(struct sysarch_args *uap) switch(uap->op) { case I386_GET_LDT: - error = i386_get_ldt(lp, uap->parms, &uap->sysmsg_result); + error = ki386_get_ldt(lp, uap->parms, &uap->sysmsg_result); break; case I386_SET_LDT: - error = i386_set_ldt(lp, uap->parms, &uap->sysmsg_result); + error = ki386_set_ldt(lp, uap->parms, &uap->sysmsg_result); break; case I386_GET_IOPERM: - error = i386_get_ioperm(lp, uap->parms); + error = ki386_get_ioperm(lp, uap->parms); break; case I386_SET_IOPERM: - error = i386_set_ioperm(lp, uap->parms); + error = ki386_set_ioperm(lp, uap->parms); break; case I386_VM86: error = vm86_sysarch(lp, uap->parms); @@ -164,7 +164,7 @@ i386_extend_pcb(struct lwp *lp) } static int -i386_set_ioperm(struct lwp *lp, char *args) +ki386_set_ioperm(struct lwp *lp, char *args) { int i, error; struct i386_ioperm_args ua; @@ -202,7 +202,7 @@ i386_set_ioperm(struct lwp *lp, char *args) } static int -i386_get_ioperm(struct lwp *lp, char *args) +ki386_get_ioperm(struct lwp *lp, char *args) { int i, state, error; struct i386_ioperm_args ua; @@ -349,7 +349,7 @@ user_ldt_free(struct pcb *pcb) } static int -i386_get_ldt(struct lwp *lwp, char *args, int *res) +ki386_get_ldt(struct lwp *lwp, char *args, int *res) { int error = 0; struct pcb *pcb = lwp->lwp_thread->td_pcb; @@ -362,7 +362,7 @@ i386_get_ldt(struct lwp *lwp, char *args, int *res) return(error); #ifdef DEBUG - printf("i386_get_ldt: start=%d num=%d descs=%p\n", + printf("ki386_get_ldt: start=%d num=%d descs=%p\n", uap->start, uap->num, (void *)uap->descs); #endif @@ -395,7 +395,7 @@ i386_get_ldt(struct lwp *lwp, char *args, int *res) } static int -i386_set_ldt(struct lwp *lp, char *args, int *res) +ki386_set_ldt(struct lwp *lp, char *args, int *res) { int error = 0; int largest_ld; @@ -409,7 +409,7 @@ i386_set_ldt(struct lwp *lp, char *args, int *res) return(error); #ifdef DEBUG - printf("i386_set_ldt: start=%d num=%d descs=%p\n", + printf("ki386_set_ldt: start=%d num=%d descs=%p\n", uap->start, uap->num, (void *)uap->descs); #endif -- 2.41.0