Update cups-x509 and cups-oauth commands to be consistent with the man pages.

Author: michaelrsweet

tools/cups-oauth.c

@@ -6,7 +6,7 @@
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more
 // information.
 //
-// Usage: cups-oauth [OPTIONS] [COMMAND [ARGUMENT(S)]]
+// Usage: cups-oauth [OPTIONS] [SUB-COMMAND [ARGUMENT(S)]]
 //
 // Commands:
 //
@@ -521,9 +521,9 @@ do_set_client_data(
 static int				// O - Exit status
 usage(FILE *out)			// I - Output file
 {
-  cupsLangPuts(out, _("Usage: cups-oauth [OPTIONS] [COMMAND [ARGUMENT(S)]]"));
+  cupsLangPuts(out, _("Usage: cups-oauth [OPTIONS] [SUB-COMMAND [ARGUMENT(S)]]"));
   cupsLangPuts(out, "");
-  cupsLangPuts(out, _("Commands:"));
+  cupsLangPuts(out, _("Sub-Commands:"));
   cupsLangPuts(out, "");
   cupsLangPuts(out, _("authorize [RESOURCE]           Authorize access to a resource"));
   cupsLangPuts(out, _("clear [RESOURCE]               Clear the authorization for a resource"));

tools/cups-x509.c

@@ -554,9 +554,7 @@ do_client(const char *uri,		// I - URI
           bool       require_ca)	// I - Require a CA-signed cert?
 {
   http_t	*http;			// HTTP connection
-  char		scheme[HTTP_MAX_URI],	// Scheme from URI
-		hostname[HTTP_MAX_URI],	// Hostname from URI
-		username[HTTP_MAX_URI],	// Username:password from URI
+  char		hostname[HTTP_MAX_URI],	// Hostname from URI
 		resource[HTTP_MAX_URI];	// Resource from URI
   int		port;			// Port number from URI
   http_trust_t	trust;			// Trust evaluation for connection