2007-01-31 Martin Hunt <hunt@redhat.com>

	* 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.

1 files changed, 19 insertions, 19 deletions

diff --git a/runtime/stack-i386.c b/runtime/stack-i386.c
index d36f30d2..d10a8cfe 100644
--- a/runtime/stack-i386.c
+++ b/runtime/stack-i386.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*-
  * i386 stack tracing functions
- * Copyright (C) 2005, 2006 Red Hat Inc.
+ * Copyright (C) 2005, 2006, 2007 Red Hat Inc.
  *
  * This file is part of systemtap, and is free software.  You can
  * redistribute it and/or modify it under the terms of the GNU General
@@ -18,7 +18,7 @@ static inline int _stp_valid_stack_ptr_info(struct unwind_frame_info *info)
 }
 
 static int
-_stp_show_trace_unwind(String str, struct unwind_frame_info *info, int verbose)
+_stp_show_trace_unwind(struct unwind_frame_info *info, int verbose)
 {
 	int n = 0;
 
@@ -27,11 +27,11 @@ _stp_show_trace_unwind(String str, struct unwind_frame_info *info, int verbose)
 			break;
 		n++;
 		if (verbose) {
-			_stp_string_cat(str, " ");
-			_stp_symbol_sprint (str, UNW_PC(info));
-			_stp_string_cat(str, "\n");
+			_stp_print_char (' ');
+			_stp_symbol_print (UNW_PC(info));
+			_stp_print_char ('\n');
 		} else
-			_stp_sprintf (str, "%p ", UNW_PC(info));
+			_stp_printf ("%p ", UNW_PC(info));
 		if (arch_unw_user_mode(info))
 			break;
 	}
@@ -44,7 +44,7 @@ static inline int _stp_valid_stack_ptr(unsigned long context, unsigned long p)
 	return	p > context && p < context + THREAD_SIZE - 3;
 }
 
-static void __stp_stack_sprint (String str, struct pt_regs *regs, int verbose, int levels)
+static void __stp_stack_print (struct pt_regs *regs, int verbose, int levels)
 {
 	unsigned long *stack = (unsigned long *)&REG_SP(regs);
 	unsigned long context = (unsigned long)stack & ~(THREAD_SIZE - 1);
@@ -54,12 +54,12 @@ static void __stp_stack_sprint (String str, struct pt_regs *regs, int verbose, i
 #ifdef CONFIG_STACK_UNWIND
 	struct unwind_frame_info info;
 	if (unwind_init_frame_info(&info, current, regs) == 0)
-		uw_ret = _stp_show_trace_unwind(str, &info, verbose);
+		uw_ret = _stp_show_trace_unwind(&info, verbose);
 	stack = (void *)UNW_SP(&info);
 #endif
 
 	if (uw_ret == 0)
-		_stp_string_cat(str, "Inexact backtrace:\n");
+		_stp_print("Inexact backtrace:\n");
 
 #ifdef	CONFIG_FRAME_POINTER
 	{
@@ -72,13 +72,13 @@ static void __stp_stack_sprint (String str, struct pt_regs *regs, int verbose, i
 			if (verbose) {
 				if (uw_ret) {
 					uw_ret = 0;
-					_stp_string_cat(str, "Leftover inexact backtrace:\n");
+					_stp_print("Leftover inexact backtrace:\n");
 				}
-				_stp_string_cat(str, " ");
-				_stp_symbol_sprint (str, addr);
-				_stp_string_cat(str, "\n");
+				_stp_print_char(' ');
+				_stp_symbol_print (addr);
+				_stp_print_char('\n');
 			} else
-				_stp_sprintf (str, "%p ", (void *)addr);
+				_stp_printf ("%p ", (void *)addr);
 			ebp = *(unsigned long *)ebp;
 		}
 	}
@@ -89,13 +89,13 @@ static void __stp_stack_sprint (String str, struct pt_regs *regs, int verbose, i
 			if (verbose) {
 				if (uw_ret) {
 					uw_ret = 0;
-					_stp_string_cat(str, "Leftover inexact backtrace:\n");
+					_stp_print("Leftover inexact backtrace:\n");
 				}
-				_stp_string_cat(str, " ");
-				_stp_symbol_sprint(str, addr);
-				_stp_string_cat(str, "\n");
+				_stp_print_char(' ');
+				_stp_symbol_print(addr);
+				_stp_print_char('\n');
 			} else
-				_stp_sprintf (str, "%p ", (void *)addr);
+				_stp_printf ("%p ", (void *)addr);
 		}
 	}
 #endif