From 1a9dbd91d1714133deacf8e531cd3bfcd443eb39 Mon Sep 17 00:00:00 2001 From: Nils Carlson Date: Thu, 10 Mar 2011 11:12:35 +0100 Subject: [PATCH] libust: remove process_simple_client_cmd function It was only used by one command, so move the command into the big case statement and remove a now unnecessary function. Spring cleaning. Signed-off-by: Nils Carlson --- libust/tracectl.c | 46 +++++++++++++++++----------------------------- 1 file changed, 17 insertions(+), 29 deletions(-) diff --git a/libust/tracectl.c b/libust/tracectl.c index 463edb6..f59edd3 100644 --- a/libust/tracectl.c +++ b/libust/tracectl.c @@ -584,31 +584,6 @@ unlock_traces: return retval; } -/* Simple commands are those which need only respond with a return value. */ -static int process_simple_client_cmd(int command, char *recv_buf) -{ - int result; - - switch(command) { - case SET_SOCK_PATH: - { - struct ustcomm_single_field *sock_msg; - sock_msg = (struct ustcomm_single_field *)recv_buf; - result = ustcomm_unpack_single_field(sock_msg); - if (result < 0) { - return result; - } - return setenv("UST_DAEMON_SOCKET", sock_msg->field, 1); - } - - default: - return -EINVAL; - } - - return 0; -} - - static int process_trace_cmd(int command, char *trace_name) { int result; @@ -1060,6 +1035,21 @@ static void process_client_cmd(struct ustcomm_header *recv_header, goto send_response; } + case SET_SOCK_PATH: + { + struct ustcomm_single_field *sock_msg; + sock_msg = (struct ustcomm_single_field *)recv_buf; + result = ustcomm_unpack_single_field(sock_msg); + if (result < 0) { + reply_header->result = -EINVAL; + goto send_response; + } + + reply_header->result = setenv("UST_DAEMON_SOCKET", + sock_msg->field, 1); + + goto send_response; + } case START: case SETUP_TRACE: case ALLOC_TRACE: @@ -1086,11 +1076,9 @@ static void process_client_cmd(struct ustcomm_header *recv_header, } default: - reply_header->result = - process_simple_client_cmd(recv_header->command, - recv_buf); - goto send_response; + reply_header->result = -EINVAL; + goto send_response; } return; -- 2.34.1