ACK.
On Tue, Feb 1, 2011 at 3:16 AM, Adam Stokes <astokes(a)fedoraproject.org> wrote:
- Rather than hardcoding the process name in print_usage we pass the
existing variable proc_name to make our help output friendlier
---
src/lib/mh_agent.cpp | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/lib/mh_agent.cpp b/src/lib/mh_agent.cpp
index c826760..0f6a8ce 100644
--- a/src/lib/mh_agent.cpp
+++ b/src/lib/mh_agent.cpp
@@ -99,9 +99,9 @@ struct option opt[] = {
};
static void
-print_usage()
+print_usage(const char *proc_name)
{
- printf("Usage:\tmatahari-DAEMONd <options>\n");
+ printf("Usage:\tmatahari-%sd <options>\n", proc_name);
printf("\t-d | --daemon run as a daemon.\n");
printf("\t-h | --help print this help message.\n");
printf("\t-b | --broker specify broker host name..\n");
@@ -209,7 +209,7 @@ MatahariAgent::init(int argc, char **argv, const char* proc_name)
switch (arg) {
case 'h':
case '?':
- print_usage();
+ print_usage(proc_name);
exit(0);
break;
case 'd':
@@ -223,7 +223,7 @@ MatahariAgent::init(int argc, char **argv, const char* proc_name)
if (optarg) {
service = strdup(optarg);
} else {
- print_usage();
+ print_usage(proc_name);
exit(1);
}
break;
@@ -231,7 +231,7 @@ MatahariAgent::init(int argc, char **argv, const char* proc_name)
if (optarg) {
username = strdup(optarg);
} else {
- print_usage();
+ print_usage(proc_name);
exit(1);
}
break;
@@ -239,7 +239,7 @@ MatahariAgent::init(int argc, char **argv, const char* proc_name)
if (optarg) {
password = strdup(optarg);
} else {
- print_usage();
+ print_usage(proc_name);
exit(1);
}
break;
@@ -250,7 +250,7 @@ MatahariAgent::init(int argc, char **argv, const char* proc_name)
if (optarg) {
serverport = atoi(optarg);
} else {
- print_usage();
+ print_usage(proc_name);
exit(1);
}
break;
@@ -258,13 +258,13 @@ MatahariAgent::init(int argc, char **argv, const char* proc_name)
if (optarg) {
servername = strdup(optarg);
} else {
- print_usage();
+ print_usage(proc_name);
exit(1);
}
break;
default:
fprintf(stderr, "unsupported option '-%c'. See
--help.\n", arg);
- print_usage();
+ print_usage(proc_name);
exit(0);
break;
}
--
1.7.3.5
_______________________________________________
Matahari mailing list
Matahari(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/matahari