s3 net: Fix compile warnings

1 files changed, 38 insertions, 24 deletions

diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index 8fc22fbcfa..fb9d80b876 100644
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -471,8 +471,10 @@ static int rpc_registry_setvalue(struct net_context *c, int argc,
 				 const char **argv )
 {
 	if (argc < 4 || c->display_usage) {
-		d_fprintf(stderr, _("Usage:"),_(" net rpc registry setvalue <key> "
-			  "<valuename> <type> [<val>]+\n"));
+		d_fprintf(stderr, "%s\n%s",
+			  _("Usage:"),
+			  _("net rpc registry setvalue <key> <valuename> "
+			    "<type> [<val>]+\n"));
 		return -1;
 	}
 
@@ -524,8 +526,9 @@ static int rpc_registry_deletevalue(struct net_context *c, int argc,
 				    const char **argv )
 {
 	if (argc != 2 || c->display_usage) {
-		d_fprintf(stderr, _("Usage:"),_(" net rpc registry deletevalue <key> "
-			  "<valuename>\n"));
+		d_fprintf(stderr, "%s\n%s",
+			  _("Usage:"),
+			  _("net rpc registry deletevalue <key> <valuename>\n"));
 		return -1;
 	}
 
@@ -639,8 +642,9 @@ static int rpc_registry_getvalue(struct net_context *c, int argc,
 				 const char **argv)
 {
 	if (argc != 2 || c->display_usage) {
-		d_fprintf(stderr, _("Usage:"),_(" net rpc registry getvalue <key> "
-			  "<valuename>\n"));
+		d_fprintf(stderr, "%s\n%s",
+			  _("Usage:"),
+			  _("net rpc registry getvalue <key> <valuename>\n"));
 		return -1;
 	}
 
@@ -666,8 +670,9 @@ static int rpc_registry_getvalueraw(struct net_context *c, int argc,
 				    const char **argv)
 {
 	if (argc != 2 || c->display_usage) {
-		d_fprintf(stderr, _("Usage:"),_(" net rpc registry getvalue <key> "
-			  "<valuename>\n"));
+		d_fprintf(stderr, "%s\n%s",
+			  _("Usage:"),
+			  _("net rpc registry getvalue <key> <valuename>\n"));
 		return -1;
 	}
 
@@ -739,8 +744,9 @@ static int rpc_registry_createkey(struct net_context *c, int argc,
 				  const char **argv )
 {
 	if (argc != 1 || c->display_usage) {
-		d_fprintf(stderr,
-			  _("Usage:"),_(" net rpc registry createkey <key>\n"));
+		d_fprintf(stderr, "%s\n%s",
+			  _("Usage:"),
+			  _("net rpc registry createkey <key>\n"));
 		return -1;
 	}
 
@@ -789,8 +795,9 @@ static NTSTATUS rpc_registry_deletekey_internal(struct net_context *c,
 static int rpc_registry_deletekey(struct net_context *c, int argc, const char **argv )
 {
 	if (argc != 1 || c->display_usage) {
-		d_fprintf(stderr,
-			  _("Usage:"),_(" net rpc registry deletekey <key>\n"));
+		d_fprintf(stderr, "%s\n%s",
+			  _("Usage:"),
+			  _("net rpc registry deletekey <key>\n"));
 		return -1;
 	}
 
@@ -820,9 +827,11 @@ static NTSTATUS rpc_registry_enumerate_internal(struct net_context *c,
 	struct registry_value **values = NULL;
 
 	if (argc != 1 || c->display_usage) {
-		d_printf(_("Usage:"),_("    net rpc registry enumerate <path>\n"));
-		d_printf(_("Example:"),"  net rpc registry enumerate "
-			   "'HKLM\\Software\\Samba'\n");
+		d_printf("%s\n%s",
+			 _("Usage:"),
+			 _("net rpc registry enumerate <path>\n"));
+		d_printf("%s  net rpc registry enumerate "
+			 "'HKLM\\Software\\Samba'\n", _("Example:"));
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
@@ -892,8 +901,9 @@ static NTSTATUS rpc_registry_save_internal(struct net_context *c,
 	struct winreg_String filename;
 
 	if (argc != 2 || c->display_usage) {
-		d_printf(_("Usage:"),_("    net rpc registry backup <path> "
-			   "<file> \n"));
+		d_printf("%s\n%s",
+			 _("Usage:"),
+			 _("net rpc registry backup <path> <file> \n"));
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
@@ -1080,7 +1090,9 @@ static int rpc_registry_dump(struct net_context *c, int argc, const char **argv)
 	REGF_NK_REC *nk;
 
 	if (argc != 1 || c->display_usage) {
-		d_printf(_("Usage:"),_("    net rpc registry dump <file> \n"));
+		d_printf("%s\n%s",
+			 _("Usage:"),
+			 _("net rpc registry dump <file> \n"));
 		return -1;
 	}
 
@@ -1124,8 +1136,9 @@ static int rpc_registry_copy(struct net_context *c, int argc, const char **argv
 	int result = 1;
 
 	if (argc != 2 || c->display_usage) {
-		d_printf(_("Usage:"),_("    net rpc registry copy <srcfile> "
-			   "<newfile>\n"));
+		d_printf("%s\n%s",
+			 _("Usage:"),
+			 _("net rpc registry copy <srcfile> <newfile>\n"));
 		return -1;
 	}
 
@@ -1196,10 +1209,11 @@ static NTSTATUS rpc_registry_getsd_internal(struct net_context *c,
 			       SEC_FLAG_SYSTEM_SECURITY;
 
 	if (argc <1 || argc > 2 || c->display_usage) {
-		d_printf(_("Usage:"),_("    net rpc registry getsd <path> "
-			   "<secinfo>\n"));
-		d_printf(_("Example:"),"  net rpc registry getsd "
-			   "'HKLM\\Software\\Samba'\n");
+		d_printf("%s\n%s",
+			 _("Usage:"),
+			 _("net rpc registry getsd <path> <secinfo>\n"));
+		d_printf("%s  net rpc registry getsd "
+			   "'HKLM\\Software\\Samba'\n", _("Example:"));
 		return NT_STATUS_INVALID_PARAMETER;
 	}