From: Ray Strode <rstrode@redhat.com>
Date: Tue, 1 Jul 2008 15:20:44 +0000 (-0400)
Subject: Drop print_usage function
X-Git-Tag: 0.5.0~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09378c11a511f8a15b5085ece4f36056ad28a277;p=thirdparty%2Fplymouth.git

Drop print_usage function

It was hard coded, and we generate help dynamically now.
---

diff --git a/src/client/plymouth.c b/src/client/plymouth.c
index cd9f47ba..ece2ea6a 100644
--- a/src/client/plymouth.c
+++ b/src/client/plymouth.c
@@ -65,13 +65,6 @@ on_disconnect (state_t *state)
   ply_event_loop_exit (state->loop, 2);
 }
 
-void
-print_usage (void)
-{
-  ply_log ("plymouth [--ping] [--update=STATUS] [--show-splash] [--details] [--newroot=<directory>] [--sysinit] [--quit]");
-  ply_flush_log ();
-}
-
 int
 main (int    argc,
       char **argv)
@@ -83,12 +76,6 @@ main (int    argc,
 
   exit_code = 0;
 
-  if (argc <= 1)
-    {
-      print_usage ();
-      return 1;
-    }
-
   state.loop = ply_event_loop_new ();
   state.client = ply_boot_client_new ();
   state.command_parser = ply_command_parser_new ("plymouth", "Boot splash control client");
@@ -129,13 +116,16 @@ main (int    argc,
                                   "update", &status,
                                   NULL);
 
-  if (should_help)
+  if (should_help || argc < 2)
     {
       char *help_string;
 
       help_string = ply_command_parser_get_help_string (state.command_parser);
 
-      printf ("%s", help_string);
+      if (argc < 2)
+        fprintf (stderr, "%s", help_string);
+      else
+        printf ("%s", help_string);
 
       free (help_string);
       return 0;