s3 net: Fix compile warnings

1 files changed, 41 insertions, 25 deletions

diff --git a/source3/utils/net_rpc_service.c b/source3/utils/net_rpc_service.c
index 55bd40dec8..3aacfd1d1d 100644
--- a/source3/utils/net_rpc_service.c
+++ b/source3/utils/net_rpc_service.c
@@ -215,7 +215,7 @@ static NTSTATUS rpc_service_list_internal(struct net_context *c,
 	uint32_t resume_handle = 0;
 
 	if (argc != 0 ) {
-		d_printf(_("Usage:")," net rpc service list\n");
+		d_printf("%s net rpc service list\n", _("Usage:"));
 		return NT_STATUS_OK;
 	}
 
@@ -324,7 +324,7 @@ static NTSTATUS rpc_service_status_internal(struct net_context *c,
 	uint32_t ret_size = 0;
 
 	if (argc != 1 ) {
-		d_printf(_("Usage:")," net rpc service status <service>\n");
+		d_printf("%s net rpc service status <service>\n", _("Usage:"));
 		return NT_STATUS_OK;
 	}
 
@@ -456,7 +456,7 @@ static NTSTATUS rpc_service_stop_internal(struct net_context *c,
 	fstring servicename;
 
 	if (argc != 1 ) {
-		d_printf(_("Usage:")," net rpc service status <service>\n");
+		d_printf("%s net rpc service status <service>\n", _("Usage:"));
 		return NT_STATUS_OK;
 	}
 
@@ -502,7 +502,7 @@ static NTSTATUS rpc_service_pause_internal(struct net_context *c,
 	fstring servicename;
 
 	if (argc != 1 ) {
-		d_printf(_("Usage:")," net rpc service status <service>\n");
+		d_printf("%s net rpc service status <service>\n", _("Usage:"));
 		return NT_STATUS_OK;
 	}
 
@@ -548,7 +548,7 @@ static NTSTATUS rpc_service_resume_internal(struct net_context *c,
 	fstring servicename;
 
 	if (argc != 1 ) {
-		d_printf(_("Usage:")," net rpc service status <service>\n");
+		d_printf("%s net rpc service status <service>\n", _("Usage:"));
 		return NT_STATUS_OK;
 	}
 
@@ -594,7 +594,7 @@ static NTSTATUS rpc_service_start_internal(struct net_context *c,
 	uint32 state = 0;
 
 	if (argc != 1 ) {
-		d_printf(_("Usage:")," net rpc service status <service>\n");
+		d_printf("%s net rpc service status <service>\n", _("Usage:"));
 		return NT_STATUS_OK;
 	}
 
@@ -674,7 +674,7 @@ static NTSTATUS rpc_service_delete_internal(struct net_context *c,
 	NTSTATUS status;
 
 	if (argc != 1 ) {
-		d_printf(_("Usage:")," net rpc service delete <service>\n");
+		d_printf("%s net rpc service delete <service>\n", _("Usage:"));
 		return NT_STATUS_OK;
 	}
 
@@ -752,8 +752,8 @@ static NTSTATUS rpc_service_create_internal(struct net_context *c,
 	const char *binary_path;
 
 	if (argc != 3) {
-		d_printf(_("Usage:")," net rpc service create <service> "
-			   "<displayname> <binarypath>\n");
+		d_printf("%s net rpc service create <service> "
+			 "<displayname> <binarypath>\n", _("Usage:"));
 		return NT_STATUS_OK;
 	}
 
@@ -821,9 +821,11 @@ static NTSTATUS rpc_service_create_internal(struct net_context *c,
 static int rpc_service_list(struct net_context *c, int argc, const char **argv )
 {
 	if (c->display_usage) {
-		d_printf(_("Usage:\n"),
+		d_printf(  "%s\n"
 			   "net rpc service list\n"
-			   "    ",_("View configured Win32 services\n"));
+			   "    %s\n",
+			 _("Usage:"),
+			 _("View configured Win32 services"));
 		return 0;
 	}
 
@@ -837,9 +839,11 @@ static int rpc_service_list(struct net_context *c, int argc, const char **argv )
 static int rpc_service_start(struct net_context *c, int argc, const char **argv )
 {
 	if (c->display_usage) {
-		d_printf(_("Usage:\n"),
+		d_printf(  "%s\n"
 			   "net rpc service start <service>\n"
-			   "    ",_("Start a Win32 service\n"));
+			   "    %s\n",
+			 _("Usage:"),
+			 _("Start a Win32 service"));
 		return 0;
 	}
 
@@ -853,9 +857,11 @@ static int rpc_service_start(struct net_context *c, int argc, const char **argv
 static int rpc_service_stop(struct net_context *c, int argc, const char **argv )
 {
 	if (c->display_usage) {
-		d_printf(_("Usage:\n"),
+		d_printf(  "%s\n"
 			   "net rpc service stop <service>\n"
-			   "    ",_("Stop a Win32 service\n"));
+			   "    %s\n",
+			 _("Usage:"),
+			 _("Stop a Win32 service"));
 		return 0;
 	}
 
@@ -869,9 +875,11 @@ static int rpc_service_stop(struct net_context *c, int argc, const char **argv )
 static int rpc_service_resume(struct net_context *c, int argc, const char **argv )
 {
 	if (c->display_usage) {
-		d_printf(_("Usage:\n"),
+		d_printf(  "%s\n"
 			   "net rpc service resume <service>\n"
-			   "    ",_("Resume a Win32 service\n"));
+			   "    %s\n",
+			 _("Usage:"),
+			 _("Resume a Win32 service"));
 		return 0;
 	}
 
@@ -885,9 +893,11 @@ static int rpc_service_resume(struct net_context *c, int argc, const char **argv
 static int rpc_service_pause(struct net_context *c, int argc, const char **argv )
 {
 	if (c->display_usage) {
-		d_printf(_("Usage:\n"),
+		d_printf(  "%s\n"
 			   "net rpc service pause <service>\n"
-			   "    ",_("Pause a Win32 service\n"));
+			   "    %s\n",
+			 _("Usage:"),
+			 _("Pause a Win32 service"));
 		return 0;
 	}
 
@@ -901,9 +911,11 @@ static int rpc_service_pause(struct net_context *c, int argc, const char **argv
 static int rpc_service_status(struct net_context *c, int argc, const char **argv )
 {
 	if (c->display_usage) {
-		d_printf(_("Usage:\n"),
+		d_printf(  "%s\n"
 			   "net rpc service status <service>\n"
-			   "     ",_("Show the current status of a service\n"));
+			   "     %s\n",
+			 _("Usage:"),
+			 _("Show the current status of a service"));
 		return 0;
 	}
 
@@ -917,9 +929,11 @@ static int rpc_service_status(struct net_context *c, int argc, const char **argv
 static int rpc_service_delete(struct net_context *c, int argc, const char **argv)
 {
 	if (c->display_usage) {
-		d_printf(_("Usage:\n"),
+		d_printf(  "%s\n"
 			   "net rpc service delete <service>\n"
-			   "    ",_("Delete a Win32 service\n"));
+			   "    %s\n",
+			 _("Usage:"),
+			 _("Delete a Win32 service"));
 		return 0;
 	}
 
@@ -933,9 +947,11 @@ static int rpc_service_delete(struct net_context *c, int argc, const char **argv
 static int rpc_service_create(struct net_context *c, int argc, const char **argv)
 {
 	if (c->display_usage) {
-		d_printf(_("Usage:\n"),
+		d_printf(  "%s\n"
 			   "net rpc service create <service>\n"
-			   "    ",_("Create a Win32 service\n"));
+			   "    %s\n",
+			 _("Usage:"),
+			 _("Create a Win32 service"));
 		return 0;
 	}