openharmony/startup_init
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_init synced 2024-11-24 00:30:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

init: fix compile warnning

Browse Source 
Signed-off-by: xionglei6 <xionglei6@huawei.com>
This commit is contained in:
xionglei6 2021-12-25 14:08:48 +08:00
parent f4e6b3eeed
commit 45553a122d
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
services/init/init_common_service.c
View File

@ -22,6 +22,7 @@
#include <stropts.h>
#endif
#include <sys/capability.h>
#include <sys/ioctl.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <time.h>
@ -72,8 +73,8 @@ static int SetPerms(const Service *service)
"SetPerms, setgid for %s failed. %d", service->name, errno);
}
if (service->servPerm.gIDCnt > 1) {
INIT_ERROR_CHECK(setgroups(service->servPerm.gIDCnt - 1, &service->servPerm.gIDArray[1]) == 0,
return SERVICE_FAILURE,
INIT_ERROR_CHECK(setgroups(service->servPerm.gIDCnt - 1, (const gid_t *)&service->servPerm.gIDArray[1]) == 0,
return SERVICE_FAILURE,
"SetPerms, setgroups failed. errno = %d, gIDCnt=%d", errno, service->servPerm.gIDCnt);
}
if (service->servPerm.uID != 0) {

3
services/init/init_service_socket.c
View File

@ -18,6 +18,7 @@
#include <fcntl.h>
#include <netinet/in.h>
#include <string.h>
#include <strings.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/uio.h>
@ -34,7 +35,7 @@
static int GetSocketAddr(struct sockaddr_un *addr, const char *name)
{
bzero(addr, sizeof(struct sockaddr_un));
(void)memset_s(addr, sizeof(struct sockaddr_un), 0x0, sizeof(struct sockaddr_un));
addr->sun_family = AF_UNIX;
size_t addrLen = sizeof(addr->sun_path);
int ret = snprintf_s(addr->sun_path, addrLen, addrLen - 1, HOS_SOCKET_DIR "/%s", name);

2
services/utils/init_utils.c
View File

@ -265,7 +265,7 @@ void WaitForFile(const char *source, unsigned int maxCount)
unsigned int maxCountTmp = maxCount;
INIT_ERROR_CHECK(maxCountTmp <= WAIT_MAX_COUNT, maxCountTmp = WAIT_MAX_COUNT, "WaitForFile max time is 5s");
struct stat sourceInfo = {};
const unsigned int waitTime = 500000;
unsigned int waitTime = 500000;
unsigned int count = 0;
do {
usleep(waitTime);

2
test/unittest/common/cmd_func_test.cpp
View File

@ -37,9 +37,11 @@ const std::string TEST_DRI = ROOT_DIR + "StartInitTestDir";
const std::string TEST_FILE = TEST_DRI + "/test.txt";
const std::string TEST_CFG_ILLEGAL = TEST_DRI + "/illegal.cfg";
const std::string TEST_PROC_MOUNTS = "/proc/mounts";
#ifndef USE_EMMC_STORAGE
const uid_t TEST_FILE_UID = 999;
const gid_t TEST_FILE_GID = 999;
const mode_t TEST_FILE_MODE = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
#endif
// init.cfg releated
const std::string CFG_FILE = "/etc/init.cfg";

2
watchdog/init_watchdog.c
View File

@ -41,7 +41,7 @@ static void WaitAtStartup(const char *source)
{
unsigned int count = 0;
struct stat sourceInfo;
const unsigned int waitTime = 500000;
unsigned int waitTime = 500000;
do {
usleep(waitTime);
count++;