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, 14 insertions, 15 deletions

diff --git a/runtime/stack-ppc64.c b/runtime/stack-ppc64.c
index 72542bd2..87c528fd 100644
--- a/runtime/stack-ppc64.c
+++ b/runtime/stack-ppc64.c
@@ -7,7 +7,7 @@
  * later version.
  */
 
-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 ip, newsp, lr = 0;
 	int count = 0;
@@ -23,14 +23,14 @@ static void __stp_stack_sprint (String str, struct pt_regs *regs, int verbose, i
 		ip = _sp[2];
 		if (!firstframe || ip != lr) {
 			if (verbose) {
-				_stp_sprintf(str, "[%016lx] [%016lx] ", sp, ip);
-				_stp_symbol_sprint(str, ip);
+				_stp_printf("[%p] [%p] ", sp, ip);
+				_stp_symbol_print(ip);
 				if (firstframe)
-					_stp_string_cat(str, " (unreliable)");
-				_stp_string_cat(str, "\n");
+					_stp_print(" (unreliable)");
+				_stp_print_char('\n');
 			}
 			else
-				_stp_sprintf(str,"%lx ", ip);
+				_stp_printf("%p ", ip);
 		}
 		firstframe = 0;
 		/*
@@ -41,19 +41,18 @@ static void __stp_stack_sprint (String str, struct pt_regs *regs, int verbose, i
 			struct pt_regs *regs = (struct pt_regs *)
 				(sp + STACK_FRAME_OVERHEAD);
 			if (verbose) {
-				_stp_sprintf(str, "--- Exception: %lx at ",
-						regs->trap);
-				_stp_symbol_sprint(str, regs->nip);
-				_stp_string_cat(str, "\n");
+				_stp_printf("--- Exception: %lx at ",regs->trap);
+				_stp_symbol_print(regs->nip);
+				_stp_print_char('\n');
 				lr = regs->link;
-				_stp_string_cat(str, "    LR =");
-				_stp_symbol_sprint(str, lr);
-				_stp_string_cat(str, "\n");
+				_stp_print("    LR =");
+				_stp_symbol_print(lr);
+				_stp_print_char('\n');
 				firstframe = 1;
 			}
 			else {
-				_stp_sprintf(str, "%lx ",regs->nip);
-				_stp_sprintf(str, "%lx ",regs->link);
+				_stp_printf("%p ",regs->nip);
+				_stp_printf("%p ",regs->link);
 			}
 		}