openharmony/drivers_framework
1
0
Fork 0
mirror of https://github.com/openharmony/drivers_framework.git synced 2026-07-19 16:24:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

!12 修改指针判空问题

Browse Source 
Merge pull request !12 from GongHui/master
This commit is contained in:
openharmony_ci
2021-03-18 17:34:31 +08:00
committed by Gitee
parent 7d5e8b770f 3ffbe23826
commit 137ea2b352
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/common/src/devmgr_service_start.c
+1 -2
View File
@@ -27,7 +27,7 @@ static void GetDeviceServiceNameByClass(DeviceClass deviceClass, struct HdfSBuf
struct HdfDeviceInfo *deviceInfo = NULL;
struct DevHostServiceClnt *hostClnt = NULL;
struct DevmgrService *devMgrSvc = (struct DevmgrService *)DevmgrServiceGetInstance();
if (devMgrSvc == NULL) {
if (devMgrSvc == NULL || reply == NULL) {
return;
}
@@ -53,7 +53,6 @@ static void GetDeviceServiceNameByClass(DeviceClass deviceClass, struct HdfSBuf
int DeviceManagerDispatch(struct HdfObject *stub, int code, struct HdfSBuf *data, struct HdfSBuf *reply)
{
(void)reply;
int ret = HDF_FAILURE;
int32_t deviceClass = 0;
const char *svcName = NULL;
support/posix/src/osal_time.c
+6 -6
View File
@@ -21,13 +21,13 @@ int32_t OsalGetTime(OsalTimespec *time)
struct timeval tv;
if (time == NULL) {
HDF_LOGE("%{public}s invalid para", __func__);
HDF_LOGE("%s invalid para", __func__);
return HDF_ERR_INVALID_PARAM;
}
(void)memset_s(&tv, sizeof(tv), 0, sizeof(tv));
if (gettimeofday(&tv, NULL) != 0) {
HDF_LOGE("%{public}s gettimeofday failed", __func__);
HDF_LOGE("%s gettimeofday failed", __func__);
return HDF_FAILURE;
}
time->sec = tv.tv_sec;
@@ -41,12 +41,12 @@ int32_t OsalDiffTime(const OsalTimespec *start, const OsalTimespec *end, OsalTim
uint32_t usec = 0;
uint32_t sec = 0;
if (start == NULL || end == NULL || diff == NULL) {
HDF_LOGE("%{public}s invalid para", __func__);
HDF_LOGE("%s invalid para", __func__);
return HDF_ERR_INVALID_PARAM;
}
if (start->sec > end->sec) {
HDF_LOGE("%{public}s start time later then end time", __func__);
HDF_LOGE("%s start time later then end time", __func__);
return HDF_ERR_INVALID_PARAM;
}
@@ -74,7 +74,7 @@ void OsalMSleep(uint32_t ms)
ts.tv_nsec = HDF_KILO_UNIT * HDF_KILO_UNIT * ((long)(ms % HDF_KILO_UNIT));
result = nanosleep(&ts, &ts);
if (result != 0) {
HDF_LOGE("%{public}s OsalMSleep failed %{public}d", __func__, errno);
HDF_LOGE("%s OsalMSleep failed %d", __func__, errno);
}
}
@@ -94,7 +94,7 @@ uint64_t OsalGetSysTimeMs()
(void)memset_s(&tv, sizeof(tv), 0, sizeof(tv));
if (gettimeofday(&tv, NULL) != 0) {
HDF_LOGE("%{public}s gettimeofday failed", __func__);
HDF_LOGE("%s gettimeofday failed", __func__);
return 0;
}