From 7bd026f44412024559f7573f48c9201c2d8c8a64 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Tue, 20 May 2008 11:32:05 +0200 Subject: [PATCH] Revert "Move svc_status_string() out of rpc_client/cli_svcctl.c" This reverts commit 2860ae2eb2cb99b4febb352f516b3fa9fbd2abbb. --- source/rpc_client/cli_svcctl.c | 36 +++++++++++++++++++++++++++++++++ source/utils/net_rpc_service.c | 37 ---------------------------------- 2 files changed, 36 insertions(+), 37 deletions(-) diff --git a/source/rpc_client/cli_svcctl.c b/source/rpc_client/cli_svcctl.c index 221dd60a352..b21909fd034 100644 --- a/source/rpc_client/cli_svcctl.c +++ b/source/rpc_client/cli_svcctl.c @@ -21,6 +21,42 @@ #include "includes.h" #include "rpc_client.h" +struct svc_state_msg { + uint32 flag; + const char *message; +}; + +static struct svc_state_msg state_msg_table[] = { + { SVCCTL_STOPPED, "stopped" }, + { SVCCTL_START_PENDING, "start pending" }, + { SVCCTL_STOP_PENDING, "stop pending" }, + { SVCCTL_RUNNING, "running" }, + { SVCCTL_CONTINUE_PENDING, "resume pending" }, + { SVCCTL_PAUSE_PENDING, "pause pending" }, + { SVCCTL_PAUSED, "paused" }, + { 0, NULL } +}; + + +/******************************************************************** +********************************************************************/ +const char* svc_status_string( uint32 state ) +{ + fstring msg; + int i; + + fstr_sprintf( msg, "Unknown State [%d]", state ); + + for ( i=0; state_msg_table[i].message; i++ ) { + if ( state_msg_table[i].flag == state ) { + fstrcpy( msg, state_msg_table[i].message ); + break; + } + } + + return talloc_strdup(talloc_tos(), msg); +} + /******************************************************************* *******************************************************************/ diff --git a/source/utils/net_rpc_service.c b/source/utils/net_rpc_service.c index 1b12bd31148..c4cc19eaa1c 100644 --- a/source/utils/net_rpc_service.c +++ b/source/utils/net_rpc_service.c @@ -19,43 +19,6 @@ #include "includes.h" #include "utils/net.h" - -struct svc_state_msg { - uint32 flag; - const char *message; -}; - -static struct svc_state_msg state_msg_table[] = { - { SVCCTL_STOPPED, "stopped" }, - { SVCCTL_START_PENDING, "start pending" }, - { SVCCTL_STOP_PENDING, "stop pending" }, - { SVCCTL_RUNNING, "running" }, - { SVCCTL_CONTINUE_PENDING, "resume pending" }, - { SVCCTL_PAUSE_PENDING, "pause pending" }, - { SVCCTL_PAUSED, "paused" }, - { 0, NULL } -}; - - -/******************************************************************** -********************************************************************/ -const char *svc_status_string( uint32 state ) -{ - fstring msg; - int i; - - fstr_sprintf( msg, "Unknown State [%d]", state ); - - for ( i=0; state_msg_table[i].message; i++ ) { - if ( state_msg_table[i].flag == state ) { - fstrcpy( msg, state_msg_table[i].message ); - break; - } - } - - return talloc_strdup(talloc_tos(), msg); -} - /******************************************************************** ********************************************************************/ -- 2.47.3