From 8857a715a1c9e504919e9702ee42ced4a8f5dcac Mon Sep 17 00:00:00 2001
From: hunt <hunt>
Date: Mon, 18 Sep 2006 16:49:03 +0000
Subject: 2006-09-18  Martin Hunt  <hunt@redhat.com>

	* stpd.c (usage): Remove "-m" option.
	(main): Print warning if "-m" is used.
	* librelay.c (merge_output): Rewrite to handle
	new format that support binary.
	(stp_main_loop): Read merge option from the
	transport info message.
---
 runtime/stpd/stpd.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'runtime/stpd/stpd.c')

diff --git a/runtime/stpd/stpd.c b/runtime/stpd/stpd.c
index 96710b08..a815d5be 100644
--- a/runtime/stpd/stpd.c
+++ b/runtime/stpd/stpd.c
@@ -33,7 +33,6 @@ extern int optind;
 
 int print_only = 0;
 int quiet = 0;
-int merge = 1;
 int verbose = 0;
 int target_pid = 0;
 int driver_pid = 0;
@@ -52,7 +51,6 @@ static void usage(char *prog)
 {
 	fprintf(stderr, "\n%s [-m] [-p] [-q] [-r] [-c cmd ] [-t pid]\n"
                 "\t[-b bufsize] [-o FILE] kmod-name [kmod-options]\n", prog);
-	fprintf(stderr, "-m  Don't merge per-cpu files.\n");
 	fprintf(stderr, "-p  Print only.  Don't log to files.\n");
 	fprintf(stderr, "-q  Quiet. Don't display trace to stdout.\n");
 	fprintf(stderr, "-c cmd.  Command \'cmd\' will be run and stpd will exit when it does.\n");
@@ -76,7 +74,7 @@ int main(int argc, char **argv)
 	{
 		switch (c) {
 		case 'm':
-			merge = 0;
+			fprintf(stderr, "Warning: -m option deprecated. Ignoring...\n");
 			break;
 		case 'p':
 			print_only = 1;
-- 
cgit