From 1b276fc2991255d65c28fa2df03b7b9ecc7d4f7b Mon Sep 17 00:00:00 2001 From: hunt Date: Wed, 31 Jan 2007 20:13:02 +0000 Subject: 2007-01-31 Martin Hunt * string.c (_stp_string_init): Deleted. (_stp_sprintf): Deleted. (_stp_vsprintf): Deleted. (_stp_string_cat_cstr): Deleted. (_stp_string_cat_string): Deleted. (_stp_string_cat_char): Deleted. (_stp_string_ptr): Deleted. (_stp_string_cat): Deleted. (_stp_snprintf): Moved from vsprintf.c. (_stp_vscnprintf): Moved from vsprintf.c. * string.h (STP_STRING_SIZE): Deleted. (STP_NUM_STRINGS): Deleted. Remove all references to type "String". * vsprintf.c (_stp_vscnprintf): Moved to string.c. (_stp_snprintf): Moved to string.c * sym.c (_stp_symbol_sprint): Replaced with _stp_symbol_print, which writes to the print buffer. (_stp_symbol_sprint_basic): Replaced with _stp_symbol_snprint. * runtime.h: Include io.c. * stat-common.c: Use new _stp_print* functions. * stat.c: Ditto. * regs.c: Renamed to regs-ia64.c. * current.c: Renamed regs.c. * regs-ia64.c: New file (renamed from regs.c). * stack.c (_stp_stack_sprint): Renamed _stp_stack_print and now just prints to the print buffer. Calls __stp_stack_print instead of __stp_stack_sprint. (_stp_stack_snprint): New function. Calls _stp_stack_print and then copies the print buffer into a string. (_stp_stack_printj): Deleted. (_stp_ustack_sprint): Deleted. * stack-*.c: Rewritten to print instead of writing to strings. Uses new _stp_print* functions. * print.c (_stp_printf): Create new function instead of macro. (_stp_print): Ditto. (_stp_print_char): New function. * map.c: Use _stp_print() and _stp_print_char() instead of _stp_print_cstr(). * io.c (_stp_vlog): Use _stp_print() instead of _stp_string_cat_cstr(). * copy.c (_stp_string_from_user): Deleted. --- runtime/vsprintf.c | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'runtime/vsprintf.c') diff --git a/runtime/vsprintf.c b/runtime/vsprintf.c index 4582ad83..eb47e156 100644 --- a/runtime/vsprintf.c +++ b/runtime/vsprintf.c @@ -427,21 +427,4 @@ int _stp_vsnprintf(char *buf, size_t size, const char *fmt, va_list args) return str-buf; } -int _stp_vscnprintf(char *buf, size_t size, const char *fmt, va_list args) -{ - int i = vsnprintf(buf,size,fmt,args); - return (i >= size) ? (size - 1) : i; -} - -int _stp_snprintf(char *buf, size_t size, const char *fmt, ...) -{ - va_list args; - int i; - - va_start(args, fmt); - i=_stp_vsnprintf(buf,size,fmt,args); - va_end(args); - return i; -} - #endif /* _VSPRINTF_C_ */ -- cgit