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/io.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'runtime/io.c') diff --git a/runtime/io.c b/runtime/io.c index 1483acfd..34c69727 100644 --- a/runtime/io.c +++ b/runtime/io.c @@ -11,11 +11,6 @@ #ifndef _IO_C_ #define _IO_C_ -#include "transport/transport.c" - -void _stp_print_flush (void); -void _stp_string_cat_cstr (String str1, const char *str2); - /** @file io.c * @brief I/O for printing warnings, errors and debug messages. */ @@ -27,12 +22,6 @@ void _stp_string_cat_cstr (String str1, const char *str2); #define ERR_STRING "ERROR: " enum code { INFO=0, WARN, ERROR, DBUG }; -/** private buffer for _stp_log() */ -#define STP_LOG_BUF_LEN 256 - -typedef char _stp_lbuf[STP_LOG_BUF_LEN]; -void *Stp_lbuf = NULL; - static void _stp_vlog (enum code type, const char *func, int line, const char *fmt, va_list args) { int num; @@ -60,7 +49,7 @@ static void _stp_vlog (enum code type, const char *func, int line, const char *f if (type != DBUG) _stp_write(STP_OOB_DATA, buf, start + num + 1); else { - _stp_string_cat_cstr(_stp_stdout,buf); + _stp_print(buf); _stp_print_flush(); } } -- cgit