提交 45553a12 编写于 作者: X xionglei6

init: fix compile warnning

Signed-off-by: Nxionglei6 <xionglei6@huawei.com>
上级 f4e6b3ee
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <stropts.h> #include <stropts.h>
#endif #endif
#include <sys/capability.h> #include <sys/capability.h>
#include <sys/ioctl.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <time.h> #include <time.h>
...@@ -72,8 +73,8 @@ static int SetPerms(const Service *service) ...@@ -72,8 +73,8 @@ static int SetPerms(const Service *service)
"SetPerms, setgid for %s failed. %d", service->name, errno); "SetPerms, setgid for %s failed. %d", service->name, errno);
} }
if (service->servPerm.gIDCnt > 1) { if (service->servPerm.gIDCnt > 1) {
INIT_ERROR_CHECK(setgroups(service->servPerm.gIDCnt - 1, &service->servPerm.gIDArray[1]) == 0, INIT_ERROR_CHECK(setgroups(service->servPerm.gIDCnt - 1, (const gid_t *)&service->servPerm.gIDArray[1]) == 0,
return SERVICE_FAILURE, return SERVICE_FAILURE,
"SetPerms, setgroups failed. errno = %d, gIDCnt=%d", errno, service->servPerm.gIDCnt); "SetPerms, setgroups failed. errno = %d, gIDCnt=%d", errno, service->servPerm.gIDCnt);
} }
if (service->servPerm.uID != 0) { if (service->servPerm.uID != 0) {
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <string.h> #include <string.h>
#include <strings.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/uio.h> #include <sys/uio.h>
...@@ -34,7 +35,7 @@ ...@@ -34,7 +35,7 @@
static int GetSocketAddr(struct sockaddr_un *addr, const char *name) 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; addr->sun_family = AF_UNIX;
size_t addrLen = sizeof(addr->sun_path); size_t addrLen = sizeof(addr->sun_path);
int ret = snprintf_s(addr->sun_path, addrLen, addrLen - 1, HOS_SOCKET_DIR "/%s", name); int ret = snprintf_s(addr->sun_path, addrLen, addrLen - 1, HOS_SOCKET_DIR "/%s", name);
......
...@@ -265,7 +265,7 @@ void WaitForFile(const char *source, unsigned int maxCount) ...@@ -265,7 +265,7 @@ void WaitForFile(const char *source, unsigned int maxCount)
unsigned int maxCountTmp = maxCount; unsigned int maxCountTmp = maxCount;
INIT_ERROR_CHECK(maxCountTmp <= WAIT_MAX_COUNT, maxCountTmp = WAIT_MAX_COUNT, "WaitForFile max time is 5s"); INIT_ERROR_CHECK(maxCountTmp <= WAIT_MAX_COUNT, maxCountTmp = WAIT_MAX_COUNT, "WaitForFile max time is 5s");
struct stat sourceInfo = {}; struct stat sourceInfo = {};
const unsigned int waitTime = 500000; unsigned int waitTime = 500000;
unsigned int count = 0; unsigned int count = 0;
do { do {
usleep(waitTime); usleep(waitTime);
......
...@@ -37,9 +37,11 @@ const std::string TEST_DRI = ROOT_DIR + "StartInitTestDir"; ...@@ -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_FILE = TEST_DRI + "/test.txt";
const std::string TEST_CFG_ILLEGAL = TEST_DRI + "/illegal.cfg"; const std::string TEST_CFG_ILLEGAL = TEST_DRI + "/illegal.cfg";
const std::string TEST_PROC_MOUNTS = "/proc/mounts"; const std::string TEST_PROC_MOUNTS = "/proc/mounts";
#ifndef USE_EMMC_STORAGE
const uid_t TEST_FILE_UID = 999; const uid_t TEST_FILE_UID = 999;
const gid_t TEST_FILE_GID = 999; const gid_t TEST_FILE_GID = 999;
const mode_t TEST_FILE_MODE = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH; const mode_t TEST_FILE_MODE = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
#endif
// init.cfg releated // init.cfg releated
const std::string CFG_FILE = "/etc/init.cfg"; const std::string CFG_FILE = "/etc/init.cfg";
......
...@@ -41,7 +41,7 @@ static void WaitAtStartup(const char *source) ...@@ -41,7 +41,7 @@ static void WaitAtStartup(const char *source)
{ {
unsigned int count = 0; unsigned int count = 0;
struct stat sourceInfo; struct stat sourceInfo;
const unsigned int waitTime = 500000; unsigned int waitTime = 500000;
do { do {
usleep(waitTime); usleep(waitTime);
count++; count++;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册