From 9fd80a9b505cc08c47c95881c6c185c1b22578cf Mon Sep 17 00:00:00 2001
From: bodea <bodea>
Date: Thu, 13 Jan 2005 08:03:14 +0000
Subject: [PATCH] move duration to before cmd_show_counters

---
 Makefile |  2 +-
 cli.c    | 68 ++++++++++++++++++++++++++++----------------------------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/Makefile b/Makefile
index c0cfce8..673c41f 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ CC = gcc
 LD = gcc
 INCLUDES = -I.
 CPPFLAGS = $(INCLUDES) $(DEFINES)
-CFLAGS = -Wall -Wformat-security -Wno-format-zero-length $(OPTIM)
+CFLAGS = -Wall -Wno-format-zero-length $(OPTIM)
 LDFLAGS =
 LDLIBS =
 INSTALL = install -c -D -o root -g root
diff --git a/cli.c b/cli.c
index dbb0ca2..ca29fe0 100644
--- a/cli.c
+++ b/cli.c
@@ -2,7 +2,7 @@
 // vim: sw=8 ts=8
 
 char const *cvs_name = "$Name:  $";
-char const *cvs_id_cli = "$Id: cli.c,v 1.43.2.3 2005/01/13 07:58:53 bodea Exp $";
+char const *cvs_id_cli = "$Id: cli.c,v 1.43.2.4 2005/01/13 08:03:14 bodea Exp $";
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -643,6 +643,39 @@ static int cmd_show_users(struct cli_def *cli, char *command, char **argv, int a
 	return CLI_OK;
 }
 
+static char *duration(time_t secs)
+{
+	static char *buf = NULL;
+	int p = 0;
+
+	if (!buf) buf = calloc(64, 1);
+
+	if (secs >= 86400)
+	{
+		int days = secs / 86400;
+		p = sprintf(buf, "%d day%s, ", days, days > 1 ? "s" : "");
+		secs %= 86400;
+	}
+
+	if (secs >= 3600)
+	{
+		int mins = secs / 60;
+		int hrs = mins / 60;
+
+		mins %= 60;
+		sprintf(buf + p, "%d:%02d", hrs, mins);
+	}
+	else if (secs >= 60)
+	{
+		int mins = secs / 60;
+		sprintf(buf + p, "%d min%s", mins, mins > 1 ? "s" : "");
+	}
+	else
+		sprintf(buf, "%ld sec%s", secs, secs > 1 ? "s" : "");
+
+	return buf;
+}
+
 static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, int argc)
 {
 	if (CLI_HELP_REQUESTED)
@@ -1720,39 +1753,6 @@ static int cmd_remove_plugin(struct cli_def *cli, char *command, char **argv, in
 	return CLI_OK;
 }
 
-static char *duration(time_t secs)
-{
-	static char *buf = NULL;
-	int p = 0;
-
-	if (!buf) buf = calloc(64, 1);
-
-	if (secs >= 86400)
-	{
-		int days = secs / 86400;
-		p = sprintf(buf, "%d day%s, ", days, days > 1 ? "s" : "");
-		secs %= 86400;
-	}
-
-	if (secs >= 3600)
-	{
-		int mins = secs / 60;
-		int hrs = mins / 60;
-
-		mins %= 60;
-		sprintf(buf + p, "%d:%02d", hrs, mins);
-	}
-	else if (secs >= 60)
-	{
-		int mins = secs / 60;
-		sprintf(buf + p, "%d min%s", mins, mins > 1 ? "s" : "");
-	}
-	else
-		sprintf(buf, "%ld sec%s", secs, secs > 1 ? "s" : "");
-
-	return buf;
-}
-
 static int cmd_uptime(struct cli_def *cli, char *command, char **argv, int argc)
 {
 	FILE *fh;
-- 
2.20.1