From f5c5e135418f336ff75fbb0b0f1b12a2d11204b6 Mon Sep 17 00:00:00 2001
From: Stephane Bortzmeyer <bortz@users.sourceforge.net>
Date: Fri, 9 Mar 2007 11:20:33 +0000
Subject: [PATCH] Small cosmetic changes (including option names)

---
 SRC/echoping.1.in |  4 ++--
 SRC/echoping.c    | 15 ++++++++-------
 SRC/util.c        |  1 +
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/SRC/echoping.1.in b/SRC/echoping.1.in
index 904a023..36fcefb 100644
--- a/SRC/echoping.1.in
+++ b/SRC/echoping.1.in
@@ -223,8 +223,8 @@ values (precedence on Linux, for instance).
 
 .SH BUGS
 
-See the TODO file or SourceForge bug tracking system at
-<http://sourceforge.net/bugs/?group_id=4581>.
+See SourceForge bug tracking system at
+<http://sourceforge.net/tracker/?group_id=4581&atid=104581>.
 
 .SH SEE ALSO
 See the README for information about other network measurements programs.
diff --git a/SRC/echoping.c b/SRC/echoping.c
index d402fb2..c8b7dff 100644
--- a/SRC/echoping.c
+++ b/SRC/echoping.c
@@ -189,9 +189,9 @@ main(argc, argv)
 		{"ipv6", '6', POPT_ARG_NONE, NULL, '6'},
 		{"module", 'm', POPT_ARG_STRING, &plugin_name, 'm',
 		 "Loads the given plugin"},
-		{"dataonly", 'D', POPT_ARG_NONE, NULL, 'D'},
-		{"numstddev", 'N', POPT_ARG_INT, &n_stddev, 'N',
-		 "Number of stddeviations to classify outliers"},
+		{"data-only", 'D', POPT_ARG_NONE, NULL, 'D'},
+		{"num-std-dev", 'N', POPT_ARG_INT, &n_stddev, 'N',
+		 "Number of standard deviations to classify outliers"},
 		POPT_TABLEEND
 	};
 	poptContext     poptcon;
@@ -690,7 +690,7 @@ main(argc, argv)
 	if (smtp) {
 		sendline = "QUIT\r\n";	/* Surprises some SMTP servers which log a
 					 * frightening NOQUEUE. Anyone knows better? 
-					 * See bug #1512776 */
+					 * * See bug #1512776 */
 	} else
 #endif
 #ifdef ICP
@@ -1226,7 +1226,7 @@ main(argc, argv)
 					}
 #endif
 
-				} else {
+				} else {	/* UDP */
 #ifdef USE_SIGACTION
 					mysigaction.sa_handler = to_alarm;
 					sigemptyset(&mysigaction.sa_mask);
@@ -1526,8 +1526,9 @@ printstats()
 			tvstddevavg(&stddev, successes, total, results,
 				    (double) n_stddev);
 			printf
-			    ("Average of values within %d standard deviations: %d.%06d\n",
-			     n_stddev, (int) stddev.tv_sec, (int) stddev.tv_usec);
+			    ("Average of values within %d standard deviation%s: %d.%06d\n",
+			     n_stddev, (n_stddev == 1 ? "" : "s"),
+			     (int) stddev.tv_sec, (int) stddev.tv_usec);
 		}
 	}
 }
diff --git a/SRC/util.c b/SRC/util.c
index 1c4122c..3236b3b 100644
--- a/SRC/util.c
+++ b/SRC/util.c
@@ -134,6 +134,7 @@ tvstddev(out, number, average, results)
 
  /* tvstddevavg -- Computes the average of values within a set of results where the
   * sample is within the given number of standard deviations from the average */
+/* TODO: IWBN to return the number of excluded outliers */
 void
 tvstddevavg(out, number, average, results, n_stddev)
 	struct timeval *out;	/* contains std dev on entry */