openharmony/startup_init
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_init synced 2024-11-27 02:10:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!2755 FIX:超大函数整改

Browse Source 
Merge pull request !2755 from 钟柠/0423_fun
This commit is contained in:
openharmony_ci 2024-04-28 02:52:55 +00:00 committed by Gitee
commit faf9cfc7af
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
services/init/init_common_service.c
View File

@ -383,47 +383,35 @@ static int InitServiceProperties(Service *service, const ServiceArgs *pathArgs)
}
ClearEnvironment(service);
if (!IsOnDemandService(service)) {
INIT_ERROR_CHECK(CreateSocketForService(service) == 0,
service->lastErrno = INIT_ESOCKET;
return INIT_ESOCKET,
"Service error %d %s, failed to create service socket.", errno, service->name);
INIT_ERROR_CHECK(CreateSocketForService(service) == 0, service->lastErrno = INIT_ESOCKET;
return INIT_ESOCKET, "Service error %d %s, failed to create service socket.", errno, service->name);
}
SetSocketEnvForService(service);
INIT_ERROR_CHECK(CreateServiceFile(service) == 0,
service->lastErrno = INIT_EFILE;
return INIT_EFILE,
"Service error %d %s, failed to create service file.", errno, service->name);
INIT_ERROR_CHECK(CreateServiceFile(service) == 0, service->lastErrno = INIT_EFILE;
return INIT_EFILE, "Service error %d %s, failed to create service file.", errno, service->name);
if ((service->attribute & SERVICE_ATTR_CONSOLE)) {
INIT_ERROR_CHECK(OpenConsole() == 0,
service->lastErrno = INIT_ECONSOLE;
return INIT_ECONSOLE,
"Service error %d %s, failed to open console.", errno, service->name);
INIT_ERROR_CHECK(OpenConsole() == 0, service->lastErrno = INIT_ECONSOLE;
return INIT_ECONSOLE, "Service error %d %s, failed to open console.", errno, service->name);
}
if ((service->attribute & SERVICE_ATTR_KMSG)) {
OpenKmsg();
}
INIT_ERROR_CHECK(PublishHoldFds(service) == 0,
service->lastErrno = INIT_EHOLDER;
return INIT_EHOLDER,
"Service error %d %s, failed to publish fd", errno, service->name);
INIT_ERROR_CHECK(PublishHoldFds(service) == 0, service->lastErrno = INIT_EHOLDER;
return INIT_EHOLDER, "Service error %d %s, failed to publish fd", errno, service->name);
INIT_CHECK_ONLY_ELOG(BindCpuCore(service) == SERVICE_SUCCESS,
"Service warning %d %s, failed to publish fd", errno, service->name);
// permissions
ret = SetPerms(service);
INIT_ERROR_CHECK(ret == SERVICE_SUCCESS,
service->lastErrno = ret;
return ret,
"Service error %d %s, failed to set permissions.", ret, service->name);
INIT_ERROR_CHECK(ret == SERVICE_SUCCESS, service->lastErrno = ret;
return ret, "Service error %d %s, failed to set permissions.", ret, service->name);
// write pid
INIT_ERROR_CHECK(WritePid(service) == SERVICE_SUCCESS,
service->lastErrno = INIT_EWRITEPID;
return INIT_EWRITEPID,
"Service error %d %s, failed to write pid.", errno, service->name);
INIT_ERROR_CHECK(WritePid(service) == SERVICE_SUCCESS, service->lastErrno = INIT_EWRITEPID;
return INIT_EWRITEPID, "Service error %d %s, failed to write pid.", errno, service->name);
PluginExecCmdByName("setServiceContent", service->name);
return 0;

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

@ -147,7 +147,7 @@ LE_STATUS LE_StartTimer(const LoopHandle loopHandle,
uint64_t GetMinTimeoutPeriod(const EventLoop *loop)
{
LE_CHECK(loop != NULL , return 0, "Invalid loop");
LE_CHECK(loop->timerList.next != &(loop->timerList), return 0, "Invalid timeNode");
LE_ONLY_CHECK(loop->timerList.next != &(loop->timerList), return 0);
TimerNode *timerNode = ListEntry(loop->timerList.next, TimerNode, node);
LE_CHECK(timerNode != NULL , return 0, "Invalid timeNode");