This is an automated email from the ASF dual-hosted git repository. ligd pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
commit db0e0b9bfecea3ee408718b247452044d5b501c7 Author: Xiang Xiao <[email protected]> AuthorDate: Sun Jan 7 01:20:03 2024 +0800 adbd/logcat: Change alog_ prefix to logcat_ to unify the prefix usage in the code base Signed-off-by: Xiang Xiao <[email protected]> --- system/adb/logcat_service.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/system/adb/logcat_service.c b/system/adb/logcat_service.c index 6dc540484..2b7e73eec 100644 --- a/system/adb/logcat_service.c +++ b/system/adb/logcat_service.c @@ -36,12 +36,12 @@ * Private types ****************************************************************************/ -typedef struct alog_service_s +typedef struct logcat_service_s { adb_service_t service; uv_poll_t poll; int wait_ack; -} alog_service_t; +} logcat_service_t; /**************************************************************************** * Private Function Prototypes @@ -54,16 +54,16 @@ static void logcat_on_data_available(uv_poll_t * handle, * Private Functions ****************************************************************************/ -static int alog_on_write(adb_service_t *service, apacket *p) +static int logcat_on_write(adb_service_t *service, apacket *p) { UNUSED(p); UNUSED(service); return -1; } -static void alog_on_kick(struct adb_service_s *service) +static void logcat_on_kick(struct adb_service_s *service) { - alog_service_t *svc = container_of(service, alog_service_t, service); + logcat_service_t *svc = container_of(service, logcat_service_t, service); if (!svc->wait_ack) { int ret; @@ -72,26 +72,26 @@ static void alog_on_kick(struct adb_service_s *service) } } -static int alog_on_ack(adb_service_t *service, apacket *p) +static int logcat_on_ack(adb_service_t *service, apacket *p) { UNUSED(p); - alog_service_t *svc = container_of(service, alog_service_t, service); + logcat_service_t *svc = container_of(service, logcat_service_t, service); svc->wait_ack = 0; - alog_on_kick(service); + logcat_on_kick(service); return 0; } static void close_cb(uv_handle_t *handle) { - alog_service_t *service = container_of(handle, alog_service_t, poll); + logcat_service_t *service = container_of(handle, logcat_service_t, poll); free(service); } -static void alog_close(struct adb_service_s *service) +static void logcat_on_close(struct adb_service_s *service) { int fd; int ret; - alog_service_t *svc = container_of(service, alog_service_t, service); + logcat_service_t *svc = container_of(service, logcat_service_t, service); ret = uv_fileno((uv_handle_t *)&svc->poll, &fd); assert(ret == 0); @@ -100,12 +100,12 @@ static void alog_close(struct adb_service_s *service) uv_close((uv_handle_t *)&svc->poll, close_cb); } -static const adb_service_ops_t logcat_ops = +static const adb_service_ops_t g_logcat_ops = { - .on_write_frame = alog_on_write, - .on_ack_frame = alog_on_ack, - .on_kick = alog_on_kick, - .on_close = alog_close + .on_write_frame = logcat_on_write, + .on_ack_frame = logcat_on_ack, + .on_kick = logcat_on_kick, + .on_close = logcat_on_close }; static void logcat_on_data_available(uv_poll_t * handle, @@ -114,7 +114,7 @@ static void logcat_on_data_available(uv_poll_t * handle, int ret; int fd; apacket_uv_t *ap; - alog_service_t *service = container_of(handle, alog_service_t, poll); + logcat_service_t *service = container_of(handle, logcat_service_t, poll); adb_client_uv_t *client = (adb_client_uv_t *)handle->data; ap = adb_uv_packet_allocate(client, 0); @@ -181,15 +181,15 @@ exit_stop_service: adb_service_t * logcat_service(adb_client_t *client, const char *params) { int ret; - alog_service_t *service = - (alog_service_t *)malloc(sizeof(alog_service_t)); + logcat_service_t *service = + (logcat_service_t *)malloc(sizeof(logcat_service_t)); if (service == NULL) { return NULL; } - service->service.ops = &logcat_ops; + service->service.ops = &g_logcat_ops; service->wait_ack = 0; /* TODO parse params string to extract logcat parameters */ @@ -208,7 +208,7 @@ adb_service_t * logcat_service(adb_client_t *client, const char *params) assert(ret == 0); service->poll.data = client; - alog_on_kick(&service->service); + logcat_on_kick(&service->service); return &service->service; }
