msg: refactoring

1 files changed, 9 insertions, 9 deletions

diff --git a/src/msg.c b/src/msg.c
index fc0b93c..9262f70 100644
--- a/src/msg.c
+++ b/src/msg.c
@@ -5,6 +5,13 @@
 #include <stdlib.h>
 #include <string.h>
 
+void msg_free(const struct msg *msg)
+{
+	for (int i = 0; i < msg->argc; ++i)
+		free(msg->argv[i]);
+	free(msg->argv);
+}
+
 int msg_from_argv(struct msg *msg, const char *argv[])
 {
 	int argc = 0;
@@ -114,7 +121,7 @@ free_buf:
 	return ret;
 }
 
-int msg_send_and_wait_for_result(int fd, const struct msg *msg, int *result)
+int msg_send_and_wait(int fd, const struct msg *msg, int *result)
 {
 	int ret = 0;
 
@@ -162,7 +169,7 @@ free_buf:
 	return ret;
 }
 
-int msg_recv_and_send_result(int fd, msg_handler handler, void *arg)
+int msg_recv_and_handle(int fd, msg_handler handler, void *arg)
 {
 	struct msg msg;
 	int result;
@@ -184,13 +191,6 @@ free_msg:
 	return ret;
 }
 
-void msg_free(const struct msg *msg)
-{
-	for (int i = 0; i < msg->argc; ++i)
-		free(msg->argv[i]);
-	free(msg->argv);
-}
-
 int msg_dump_unknown(const struct msg *msg)
 {
 	print_log("Received an unknown message:\n");