From 88a1465936412b81d9698b19fbb4bc556317e505 Mon Sep 17 00:00:00 2001 From: Mateusz Majewski Date: Fri, 2 Apr 2021 10:16:49 +0200 Subject: [PATCH] Rename toggle request to a better name Change-Id: I6fdeded8caea015c71c7190d7500ec7dae027edf --- include/logpipe.h | 16 ++++++++-------- src/logctl/logctl.c | 2 +- src/logger/log_buffer.c | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/logpipe.h b/include/logpipe.h index 144114c..285e36d 100644 --- a/include/logpipe.h +++ b/include/logpipe.h @@ -31,17 +31,17 @@ #define DLOG_CTRL_REQ_PIPE (struct dlog_control_msg) {sizeof(struct dlog_control_msg), DLOG_REQ_PIPE, 0} enum { - DLOG_REQ_REPLY = 1, + DLOG_REQ_REPLY = 1, /* the following can be OR'd with REPLY, * but are exclusive with each other */ - DLOG_REQ_PIPE = 1 << 1, - DLOG_REQ_CLEAR = 2 << 1, - DLOG_REQ_HANDLE_LOGUTIL = 3 << 1, - DLOG_REQ_GET_CAPACITY = 4 << 1, - DLOG_REQ_GET_USAGE = 5 << 1, - DLOG_REQ_STDOUT = 6 << 1, - DLOG_REQ_TOGGLE_STDOUT = 7 << 1, + DLOG_REQ_PIPE = 1 << 1, + DLOG_REQ_CLEAR = 2 << 1, + DLOG_REQ_HANDLE_LOGUTIL = 3 << 1, + DLOG_REQ_GET_CAPACITY = 4 << 1, + DLOG_REQ_GET_USAGE = 5 << 1, + DLOG_REQ_STDOUT = 6 << 1, + DLOG_REQ_GLOBAL_ENABLE_DISABLE_STDOUT = 7 << 1, }; enum { diff --git a/src/logctl/logctl.c b/src/logctl/logctl.c index 1ff285c..453b95d 100644 --- a/src/logctl/logctl.c +++ b/src/logctl/logctl.c @@ -454,7 +454,7 @@ int handle_stdout_one_pipe(log_id_t id, struct log_config *conf, bool enabled) char enabled_char = (char)enabled; - int r = send_dlog_request(sock_fd, DLOG_REQ_TOGGLE_STDOUT, &enabled_char, sizeof(enabled_char)); + int r = send_dlog_request(sock_fd, DLOG_REQ_GLOBAL_ENABLE_DISABLE_STDOUT, &enabled_char, sizeof(enabled_char)); if (r < 0) return r; diff --git a/src/logger/log_buffer.c b/src/logger/log_buffer.c index bc0eb55..87e5af4 100644 --- a/src/logger/log_buffer.c +++ b/src/logger/log_buffer.c @@ -317,12 +317,12 @@ static int service_writer_handle_req_clear(struct logger *server, struct writer return 0; } -static int service_writer_handle_req_toggle_stdout(struct logger *server, struct writer *wr, struct dlog_control_msg *msg) +static int service_writer_handle_req_global_enable_disable_stdout(struct logger *server, struct writer *wr, struct dlog_control_msg *msg) { assert(server); assert(msg); - assert(msg->request == DLOG_REQ_TOGGLE_STDOUT); + assert(msg->request == DLOG_REQ_GLOBAL_ENABLE_DISABLE_STDOUT); assert(wr); assert(wr->buf_ptr); @@ -350,11 +350,11 @@ static int service_writer_handle_req_ctrl(struct logger *server, struct writer * int ret; switch (msg->request) { - case DLOG_REQ_CLEAR: ret = service_writer_handle_req_clear (server, wr, msg); break; - case DLOG_REQ_HANDLE_LOGUTIL: ret = service_writer_handle_req_util (server, wr, msg); break; - case DLOG_REQ_GET_CAPACITY: ret = service_writer_handle_req_get_capacity (server, wr, msg); break; - case DLOG_REQ_GET_USAGE: ret = service_writer_handle_req_get_usage (server, wr, msg); break; - case DLOG_REQ_TOGGLE_STDOUT: ret = service_writer_handle_req_toggle_stdout(server, wr, msg); break; + case DLOG_REQ_CLEAR: ret = service_writer_handle_req_clear (server, wr, msg); break; + case DLOG_REQ_HANDLE_LOGUTIL: ret = service_writer_handle_req_util (server, wr, msg); break; + case DLOG_REQ_GET_CAPACITY: ret = service_writer_handle_req_get_capacity (server, wr, msg); break; + case DLOG_REQ_GET_USAGE: ret = service_writer_handle_req_get_usage (server, wr, msg); break; + case DLOG_REQ_GLOBAL_ENABLE_DISABLE_STDOUT: ret = service_writer_handle_req_global_enable_disable_stdout(server, wr, msg); break; default: ret = -EINVAL; } -- 2.7.4