MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Merge "Added NULL check before function call""

Browse source
This commit is contained in:
Linux Build Service Account 2013-11-25 20:13:48 -08:00 committed by Gerrit - the friendly Code Review server
commit 17014073f9
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
loc_api/libloc_api_50001/loc_eng.cpp
View file

@ -857,7 +857,9 @@ void LocEngReportNmea::proc() const {
gettimeofday(&tv, (struct timezone *) NULL); gettimeofday(&tv, (struct timezone *) NULL);
int64_t now = tv.tv_sec * 1000LL + tv.tv_usec / 1000; int64_t now = tv.tv_sec * 1000LL + tv.tv_usec / 1000;
CALLBACK_LOG_CALLFLOW("nmea_cb", %d, mLen); CALLBACK_LOG_CALLFLOW("nmea_cb", %d, mLen);
locEng->nmea_cb(now, mNmea, mLen);
if (locEng->nmea_cb != NULL)
locEng->nmea_cb(now, mNmea, mLen);
} }
inline void LocEngReportNmea::locallog() const { inline void LocEngReportNmea::locallog() const {
LOC_LOGV("LocEngReportNmea"); LOC_LOGV("LocEngReportNmea");

3
loc_api/libloc_api_50001/loc_eng_nmea.cpp
View file

@ -60,7 +60,8 @@ void loc_eng_nmea_send(char *pNmea, int length, loc_eng_data_s_type *loc_eng_dat
gettimeofday(&tv, (struct timezone *) NULL); gettimeofday(&tv, (struct timezone *) NULL);
int64_t now = tv.tv_sec * 1000LL + tv.tv_usec / 1000; int64_t now = tv.tv_sec * 1000LL + tv.tv_usec / 1000;
CALLBACK_LOG_CALLFLOW("nmea_cb", %p, pNmea); CALLBACK_LOG_CALLFLOW("nmea_cb", %p, pNmea);
loc_eng_data_p->nmea_cb(now, pNmea, length); if (loc_eng_data_p->nmea_cb != NULL)
loc_eng_data_p->nmea_cb(now, pNmea, length);
LOC_LOGD("NMEA <%s", pNmea); LOC_LOGD("NMEA <%s", pNmea);
} }