openharmony/startup_init
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_init synced 2024-12-01 06:10:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: code ReviewBot

Browse Source 
Signed-off-by: xionglei6 <xionglei6@huawei.com>
This commit is contained in:
xionglei6 2022-02-12 17:57:46 +08:00
parent 93bec381dd
commit d84843f66a
19 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
interfaces/innerkits/fd_holder/fd_holder.c
View File

@ -25,7 +25,7 @@
static int BuildClientSocket(void)
{
int sockFd;
sockFd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0);
sockFd = socket(AF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0);
if (sockFd < 0) {
BEGET_LOGE("Failed to build socket, err = %d", errno);
return -1;

2
interfaces/innerkits/fd_holder/fd_holder_internal.c
View File

@ -40,7 +40,7 @@ int BuildControlMessage(struct msghdr *msghdr, int *fds, int fdCount, bool send
msghdr->msg_controllen += CMSG_SPACE(sizeof(struct ucred));
}
msghdr->msg_control = calloc(1, (msghdr->msg_controllen == 0 ? 1 : msghdr->msg_controllen));
msghdr->msg_control = calloc(1, ((msghdr->msg_controllen == 0) ? 1 : msghdr->msg_controllen));
if (msghdr->msg_control == NULL) {
BEGET_LOGE("Failed to build control message");
return -1;

3
interfaces/innerkits/fs_manager/fstab_mount.c
View File

@ -170,7 +170,8 @@ static int DoResizeF2fs(const char* device, const unsigned long long size)
char **argv = (char **)cmd;
ret = ExecCommand(argc, argv);
} else {
unsigned long long realSize = size * ((unsigned long long)1024 * 1024 / 512);
unsigned long long realSize = size *
((unsigned long long)RESIZE_BUFFER_SIZE * RESIZE_BUFFER_SIZE / FS_MANAGER_BUFFER_SIZE);
char sizeStr[RESIZE_BUFFER_SIZE] = {0};
sprintf_s(sizeStr, RESIZE_BUFFER_SIZE, "%llu", realSize);
char *cmd[] = {

2
services/begetctl/param_cmd.c
View File

@ -202,7 +202,7 @@ static int32_t BShellParamCmdLs(BShellHandle shell, int32_t argc, char *argv[])
char *buffer = GetLocalBuffer(&buffSize);
char *realParameter = GetRealParameter(shell, (input == NULL) ? "" : input, buffer, buffSize);
BSH_CHECK(realParameter != NULL, return BSH_INVALID_PARAM, "Invalid shell env");
char *prefix = strdup(strlen(realParameter) == 0 ? "#" : realParameter);
char *prefix = strdup((strlen(realParameter) == 0) ? "#" : realParameter);
BSH_LOGV("BShellParamCmdLs prefix %s", prefix);
int ret = 0;
if (all != 0) {

1
services/begetctl/service_control.c
View File

@ -18,7 +18,6 @@
#include <string.h>
#include "begetctl.h"
#include "securec.h"
#include "sys_param.h"
#define SERVICE_START_NUMBER 2

2
services/begetctl/shell/shell_bas.c
View File

@ -152,7 +152,7 @@ void BShellEnvOutputResult(BShellHandle handle, int32_t result)
static void BShellEnvOutputParam(BShellHandle handle, char *var)
{
BShellEnvOutput(handle, var[0] == '$' ? var + 1 : var);
BShellEnvOutput(handle, (var[0] == '$') ? var + 1 : var);
BShellEnvOutputString(handle, " = ");
BShellEnvOutputString(handle, BShellEnvGetStringParam(handle, var));
}

1
services/init/include/init.h
View File

@ -30,6 +30,7 @@ extern "C" {
#define DEFAULT_UID_KIT_FRAMEWORK 3
// max length of one param/path
#define MAX_ONE_ARG_LEN 200
#define FD_HOLDER_BUFFER_SIZE 4096
#define UNUSED(x) (void)(x)

4
services/init/init_group_manager.c
View File

@ -114,10 +114,10 @@ static char *GetAbsolutePath(const char *path, const char *cfgName, char *buffer
ext = strcmp(cfgName + cfgNameLen - strlen(".cfg"), ".cfg") == 0;
}
if (cfgName[0] != '/') {
const char *format = (ext != 0) ? "%s/%s" : "%s/%s.cfg";
const char *format = ((ext != 0) ? "%s/%s" : "%s/%s.cfg");
len = sprintf_s(buffer, buffSize, format, path, cfgName);
} else {
const char *format = (ext != 0) ? "%s" : "%s.cfg";
const char *format = ((ext != 0) ? "%s" : "%s.cfg");
len = sprintf_s(buffer, buffSize, format, cfgName);
}
if (len <= 0) {

2
services/init/init_service_manager.c
View File

@ -274,7 +274,7 @@ static int GetServiceArgs(const cJSON *argJson, const char *name, int maxCount,
for (int i = 0; i < count + 1; ++i) {
args->argv[i] = NULL;
}
// ServiceArgs have a variety of uses, some requiring a NULL ending, some not
// ServiceArgs have a variety of uses, some requiring a NULL ending, some not
if (strcmp(name, D_CAPS_STR_IN_CFG) != 0) {
args->count = count + 1;
} else {

1
services/init/lite/init.c
View File

@ -22,7 +22,6 @@
#endif
#include "loop_event.h"
#include "parameter.h"
#include "securec.h"
static void PrintSysInfo(void)
{

4
services/init/standard/fd_holder_service.c
View File

@ -23,6 +23,8 @@
#include "loop_event.h"
#include "securec.h"
#define MSG_ARRAY_INDEX 2
static void FreeFds(int *fds)
{
if (fds != NULL) {
@ -190,7 +192,7 @@ static void HandlerFdHolder(int sock)
}
char *serviceName = msg[0];
char *action = msg[1];
char *pollStr = msg[2];
char *pollStr = msg[MSG_ARRAY_INDEX];
Service *service = GetServiceByName(serviceName);
if (CheckFdHolderPermission(service, requestPid) < 0) {

4
services/init/standard/init.c
View File

@ -47,8 +47,8 @@ static int FdHolderSockInit(void)
{
int sock = -1;
int on = 1;
int fdHolderBufferSize = 4 * 1024; // 4KiB
sock = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
int fdHolderBufferSize = FD_HOLDER_BUFFER_SIZE; // 4KiB
sock = socket(AF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
if (sock < 0) {
INIT_LOGE("Failed to create fd holder socket, err = %d", errno);
return -1;

1
services/init/standard/init_mount.c
View File

@ -16,7 +16,6 @@
#include "fs_manager/fs_manager.h"
#include "init_cmds.h"
#include "init_log.h"
#include "securec.h"
int MountRequriedPartitions(const Fstab *fstab)
{

3
services/init/standard/init_service.c
View File

@ -115,8 +115,7 @@ void GetAccessToken(void)
service->capsArgs.argv = NULL;
}
if (strlen(service->apl) == 0) {
(void)strncpy_s(service->apl, sizeof(service->apl),
"system_core", sizeof(service->apl) - 1);
(void)strncpy_s(service->apl, sizeof(service->apl), "system_core", sizeof(service->apl) - 1);
}
uint64_t tokenId = GetAccessTokenId(service->name, (const char **)service->capsArgs.argv,
service->capsArgs.count, service->apl);

3
services/loopevent/task/le_asynctask.c
View File

@ -97,8 +97,7 @@ LE_STATUS LE_StartAsyncEvent(const LoopHandle loopHandle,
const TaskHandle taskHandle, uint64_t eventId, const uint8_t *data, uint32_t buffLen)
{
LE_CHECK(loopHandle != NULL && taskHandle != NULL, return LE_INVALID_PARAM, "Invalid parameters");
BufferHandle handle = NULL;
handle = LE_CreateBuffer(loopHandle, buffLen + 1 + sizeof(eventId));
BufferHandle handle = LE_CreateBuffer(loopHandle, buffLen + 1 + sizeof(eventId));
char *buff = (char *)LE_GetBufferInfo(handle, NULL, NULL);
int ret = memcpy_s(buff, sizeof(eventId), &eventId, sizeof(eventId));
LE_CHECK(ret == 0, return -1, "Failed to copy data");

4
services/loopevent/timer/le_timer.c
View File

@ -27,9 +27,9 @@
static LE_STATUS SetTimer_(int tfd, uint64_t timeout)
{
struct itimerspec timeValue;
time_t sec = timeout / 1000;
time_t sec = timeout / TIMEOUT_BASE;
timeValue.it_interval.tv_sec = sec;
long nsec = (timeout % 1000) * 1000;
long nsec = (timeout % TIMEOUT_BASE) * TIMEOUT_BASE;
timeValue.it_interval.tv_nsec = nsec;
timeValue.it_value.tv_sec = sec;
timeValue.it_value.tv_nsec = nsec;

2
services/loopevent/timer/le_timer.h
View File

@ -18,6 +18,8 @@
#include "le_task.h"
#include "loop_event.h"
#define TIMEOUT_BASE 1000
typedef struct {
BaseTask base;
LE_ProcessTimer processTimer;

5
services/param/trigger/trigger_manager.c
View File

@ -410,8 +410,7 @@ static int CheckParamMatch_(const TriggerWorkSpace *workSpace,
PARAM_CHECK((type == TRIGGER_PARAM) || (type == TRIGGER_PARAM_WAIT), return -1, "Invaid type");
CalculatorInit(calculator, MAX_CONDITION_NUMBER, sizeof(LogicData), 1);
int ret = GetValueFromContent(content, contentSize,
0, calculator->inputName, SUPPORT_DATA_BUFFER_MAX);
int ret = GetValueFromContent(content, contentSize, 0, calculator->inputName, SUPPORT_DATA_BUFFER_MAX);
PARAM_CHECK(ret == 0, return -1, "Failed parse content name");
ret = GetValueFromContent(content, contentSize,
strlen(calculator->inputName) + 1, calculator->inputContent, SUPPORT_DATA_BUFFER_MAX);
@ -727,7 +726,7 @@ int CheckWatchTriggerTimeout(void)
TriggerHeader *GetTriggerHeader(const TriggerWorkSpace *workSpace, int type)
{
if (workSpace== NULL || type >= TRIGGER_MAX) {
if (workSpace == NULL || type >= TRIGGER_MAX) {
return NULL;
}
return (TriggerHeader *)&workSpace->triggerHead[type];

1
test/plugintest/plugin_param_test.c
View File

@ -17,7 +17,6 @@
#include <time.h>
#include "plugin_test.h"
#include "init_param.h"
#include "init_plugin.h"
#define MAX_COUNT 1000