From 5f00c532270af92858cb55a4c783db8ec6ace1bd Mon Sep 17 00:00:00 2001 From: xionglei6 Date: Thu, 11 Nov 2021 20:12:19 +0800 Subject: [PATCH] init: fix code style Signed-off-by: xionglei6 --- interfaces/innerkits/fs_manager/fs_manager_log.c | 4 ++-- services/param/adapter/param_libuvadp.c | 6 +++--- test/unittest/innerkits/innerkits_unittest.cpp | 1 - ueventd/include/ueventd.h | 1 - ueventd/ueventd_device_handler.c | 2 -- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/interfaces/innerkits/fs_manager/fs_manager_log.c b/interfaces/innerkits/fs_manager/fs_manager_log.c index 6ccb799f..af6d6dcf 100755 --- a/interfaces/innerkits/fs_manager/fs_manager_log.c +++ b/interfaces/innerkits/fs_manager/fs_manager_log.c @@ -45,7 +45,7 @@ static InitLogLevel ConvertToInitLog(FsMgrLogLevel level) static const char *ConvertToKernelLog(FsMgrLogLevel level) { - switch (level) { + switch (level) { case FSMGR_VERBOSE: // fall through case FSMGR_DEBUG: return "<7>"; @@ -94,7 +94,7 @@ static void WriteLogToFile(FILE *fp, const char *fileName, int line, const char fileName == NULL ? "" : fileName, line, "fs_manager", fmt) == -1) { return; } - fprintf(fp, "%s", fullLogMsg); + (void)fprintf(fp, "%s", fullLogMsg); return; } diff --git a/services/param/adapter/param_libuvadp.c b/services/param/adapter/param_libuvadp.c index 1bff6792..253c0ab2 100755 --- a/services/param/adapter/param_libuvadp.c +++ b/services/param/adapter/param_libuvadp.c @@ -93,8 +93,8 @@ static void OnReceiveRequest(uv_stream_t *handle, ssize_t nread, const uv_buf_t PARAM_LOGD("OnReceiveRequest %d nread %d", buf->len, nread); LibuvStreamTask *client = PARAM_ENTRY(handle, LibuvStreamTask, stream); if (client->recvMessage == NULL) { - free(buf->base); - return; + free(buf->base); + return; } ssize_t curr = 0; while (curr < nread) { @@ -346,4 +346,4 @@ int ParamServiceStop(void) uv_fs_unlink(uv_default_loop(), &req, PIPE_NAME, NULL); uv_stop(uv_default_loop()); return 0; -} \ No newline at end of file +} diff --git a/test/unittest/innerkits/innerkits_unittest.cpp b/test/unittest/innerkits/innerkits_unittest.cpp index 00f651ab..3cbb2c01 100755 --- a/test/unittest/innerkits/innerkits_unittest.cpp +++ b/test/unittest/innerkits/innerkits_unittest.cpp @@ -164,5 +164,4 @@ HWTEST_F(InnerkitsUnitTest, TestFsManagerLog, TestSize.Level1) FSMGR_LOGE("Fsmanager log to file."); FsManagerLogDeInit(); } - } // namespace init_ut diff --git a/ueventd/include/ueventd.h b/ueventd/include/ueventd.h index 9ebe2efb..a995db91 100755 --- a/ueventd/include/ueventd.h +++ b/ueventd/include/ueventd.h @@ -66,7 +66,6 @@ extern char bootDevice[CMDLINE_VALUE_LEN_MAX]; const char *ActionString(ACTION action); void ParseUeventMessage(const char *buffer, ssize_t length, struct Uevent *uevent); -//void RetriggerUevent(int sockFd); void RetriggerUevent(int sockFd, char **devices, int num); void ProcessUevent(int sockFd, char **devices, int num); diff --git a/ueventd/ueventd_device_handler.c b/ueventd/ueventd_device_handler.c index ec8b1a97..1bfc4a84 100755 --- a/ueventd/ueventd_device_handler.c +++ b/ueventd/ueventd_device_handler.c @@ -188,8 +188,6 @@ static void BuildBootDeviceSymbolLink(char **links, int linkNum, const char *par } } - - static void BuildDeviceSymbolLinks(char **links, int linkNum, const char *parent, const char *partitionName, const char *deviceName) { -- GitLab