Merge branch 'master' into pr6866

Conflicts:
	ChangeLog: Removed
	runtime/ChangeLog: Removed
	runtime/sym.c: Merged
	runtime/task_finder.c: Merged
	tapset/ChangeLog: Removed
	testsuite/ChangeLog: Removed

1 files changed, 5 insertions, 23 deletions

diff --git a/runtime/io.c b/runtime/io.c
index c49d86e6..8ddb53ac 100644
--- a/runtime/io.c
+++ b/runtime/io.c
@@ -1,6 +1,6 @@
 /* -*- linux-c -*- 
  * I/O for printing warnings, errors and debug messages
- * Copyright (C) 2005-2008 Red Hat Inc.
+ * Copyright (C) 2005-2009 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
@@ -56,24 +56,6 @@ static void _stp_vlog (enum code type, const char *func, int line, const char *f
 	put_cpu();
 }
 
-/** Logs Data.
- * This function sends the message immediately to staprun. It
- * will also be sent over the bulk transport (relayfs) if it is
- * being used. If the last character is not a newline, then one 
- * is added. This function is not as efficient as _stp_printf()
- * and should only be used for urgent messages. You probably want
- * dbug(), or _stp_warn().
- * @param fmt A variable number of args.
- * @todo Evaluate if this function is necessary.
- */
-void _stp_log (const char *fmt, ...)
-{
-	va_list args;
-	va_start(args, fmt);
-	_stp_vlog (INFO, NULL, 0, fmt, args);
-	va_end(args);
-}
-
 /** Prints warning.
  * This function sends a warning message immediately to staprun. It
  * will also be sent over the bulk transport (relayfs) if it is
@@ -81,7 +63,7 @@ void _stp_log (const char *fmt, ...)
  * is added. 
  * @param fmt A variable number of args.
  */
-void _stp_warn (const char *fmt, ...)
+static void _stp_warn (const char *fmt, ...)
 {
 	va_list args;
 	va_start(args, fmt);
@@ -97,7 +79,7 @@ void _stp_warn (const char *fmt, ...)
  * call. You should probably call return immediately after 
  * calling _stp_exit().
  */
-void _stp_exit (void)
+static void _stp_exit (void)
 {
 	_stp_exit_flag = 1;
 }
@@ -112,7 +94,7 @@ void _stp_exit (void)
  * @param fmt A variable number of args.
  * @sa _stp_exit().
  */
-void _stp_error (const char *fmt, ...)
+static void _stp_error (const char *fmt, ...)
 {
 	va_list args;
 	va_start(args, fmt);
@@ -131,7 +113,7 @@ void _stp_error (const char *fmt, ...)
  * @param fmt A variable number of args.
  * @sa _stp_error
  */
-void _stp_softerror (const char *fmt, ...)
+static void _stp_softerror (const char *fmt, ...)
 {
 	va_list args;
 	va_start(args, fmt);