Fix bug #1632091: printf format string typos. Add some more cosmetic changes.

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1570 f882894a-f735-0410-b71e-b25c423dba1c

diff --git a/plugins/check_http.c b/plugins/check_http.c
index 203ebe5c07654ecd08bdb999ed3b2b4561d7154d..b81f214616be5dc29966cc6ef7b7d9345b67141e 100644 (file)
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -1263,13 +1263,13 @@ print_help (void)
 
   printf (" %s\n", "-e, --expect=STRING");
   printf ("    %s\n", _("String to expect in first (status) line of server response (default: "));
-  printf ("%s\n", HTTP_EXPECT);
+  printf ("%s)\n", HTTP_EXPECT);
   printf ("    %s\n", _("If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"));
   printf (" %s\n", "-s, --string=STRING");
   printf ("    %s\n", _("String to expect in the content"));
   printf (" %s\n", "-u, --url=PATH");
   printf ("    %s\n", _("URL to GET or POST (default: /)"));
-  printf (" %s\n," "-P, --post=STRING");
+  printf (" %s\n", "-P, --post=STRING");
   printf ("    %s\n", _("URL encoded http POST data"));
   printf (" %s\n", "-N, --no-body");
   printf ("    %s\n", _("Don't wait for document body: stop reading after headers."));

diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index a7424305ffabc5dbcf7648f8230c0266554306dd..60872cfdff2e114358e4a0854983b1323feed147 100644 (file)
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -378,9 +378,9 @@ print_help (void)
   printf ("    %s\n", _("ldap attribute to search (default: \"(objectclass=*)\""));
   printf (" %s\n", "-b [--base]");
   printf ("    %s\n", _("ldap base (eg. ou=my unit, o=my org, c=at"));
-  printf (" %s\n," "-D [--bind]");
+  printf (" %s\n", "-D [--bind]");
   printf ("    %s\n", _("ldap bind DN (if required)"));
-  printf (" %s\n," "-P [--pass]");
+  printf (" %s\n", "-P [--pass]");
   printf ("    %s\n", _("ldap password (if required)"));
 
 #ifdef HAVE_LDAP_SET_OPTION
@@ -410,9 +410,9 @@ print_usage (void)
 {
   printf (_("Usage:"));
        printf (" %s -H <host> -b <base_dn> [-p <port>] [-a <attr>] [-D <binddn>]",progname);
-  printf ("[-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]\n",
+  printf ("\n       [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]%s\n",
 #ifdef HAVE_LDAP_SET_OPTION
-                       " [-2|-3] [-4|-6]"
+                       "\n       [-2|-3] [-4|-6]"
 #else
                        ""
 #endif