Addressing format related to formating

Added formating related issue as
genuine errors fixes

Change-Id: Ie01e9ce3bf838a37871a4779ae1403b4dca3d87c
CRs-Fixed: 2447200
This commit is contained in:
Nilesh Gharde 2019-05-16 23:57:46 +05:30 committed by Gerrit - the friendly Code Review server
parent 051bea2282
commit 210d3ca227
9 changed files with 10 additions and 12 deletions

View file

@ -255,7 +255,7 @@ bool GnssConfiguration::setBlacklistedSource(
break; break;
default: default:
copyToSource.constellation = GNSS_SV_TYPE_UNKNOWN; copyToSource.constellation = GNSS_SV_TYPE_UNKNOWN;
LOC_LOGe("Invalid constellation %u", copyFromSource.constellation); LOC_LOGe("Invalid constellation %hhu", copyFromSource.constellation);
retVal = false; retVal = false;
break; break;
} }

View file

@ -141,7 +141,7 @@ void GeofenceAPIClient::geofenceRemoveAll()
// callbacks // callbacks
void GeofenceAPIClient::onGeofenceBreachCb(GeofenceBreachNotification geofenceBreachNotification) void GeofenceAPIClient::onGeofenceBreachCb(GeofenceBreachNotification geofenceBreachNotification)
{ {
LOC_LOGD("%s]: (%zu)", __FUNCTION__, geofenceBreachNotification.count); LOC_LOGD("%s]: (%d)", __FUNCTION__, geofenceBreachNotification.count);
if (mGnssGeofencingCbIface != nullptr) { if (mGnssGeofencingCbIface != nullptr) {
for (size_t i = 0; i < geofenceBreachNotification.count; i++) { for (size_t i = 0; i < geofenceBreachNotification.count; i++) {
GnssLocation gnssLocation; GnssLocation gnssLocation;

View file

@ -517,7 +517,7 @@ void GnssAPIClient::onGnssNiCb(uint32_t id, GnssNiNotification gnssNiNotificatio
void GnssAPIClient::onGnssSvCb(GnssSvNotification gnssSvNotification) void GnssAPIClient::onGnssSvCb(GnssSvNotification gnssSvNotification)
{ {
LOC_LOGD("%s]: (count: %zu)", __FUNCTION__, gnssSvNotification.count); LOC_LOGD("%s]: (count: %u)", __FUNCTION__, gnssSvNotification.count);
mMutex.lock(); mMutex.lock();
auto gnssCbIface(mGnssCbIface); auto gnssCbIface(mGnssCbIface);
auto gnssCbIface_2_0(mGnssCbIface_2_0); auto gnssCbIface_2_0(mGnssCbIface_2_0);
@ -561,7 +561,7 @@ void GnssAPIClient::onGnssNmeaCb(GnssNmeaNotification gnssNmeaNotification)
auto r = gnssCbIface_2_0->gnssNmeaCb( auto r = gnssCbIface_2_0->gnssNmeaCb(
static_cast<V1_0::GnssUtcTime>(gnssNmeaNotification.timestamp), nmeaString); static_cast<V1_0::GnssUtcTime>(gnssNmeaNotification.timestamp), nmeaString);
if (!r.isOk()) { if (!r.isOk()) {
LOC_LOGE("%s] Error from gnssCbIface_2_0 nmea=%s length=%zu description=%s", LOC_LOGE("%s] Error from gnssCbIface_2_0 nmea=%s length=%u description=%s",
__func__, gnssNmeaNotification.nmea, gnssNmeaNotification.length, __func__, gnssNmeaNotification.nmea, gnssNmeaNotification.length,
r.description().c_str()); r.description().c_str());
} }
@ -569,7 +569,7 @@ void GnssAPIClient::onGnssNmeaCb(GnssNmeaNotification gnssNmeaNotification)
auto r = gnssCbIface->gnssNmeaCb( auto r = gnssCbIface->gnssNmeaCb(
static_cast<V1_0::GnssUtcTime>(gnssNmeaNotification.timestamp), nmeaString); static_cast<V1_0::GnssUtcTime>(gnssNmeaNotification.timestamp), nmeaString);
if (!r.isOk()) { if (!r.isOk()) {
LOC_LOGE("%s] Error from gnssNmeaCb nmea=%s length=%zu description=%s", LOC_LOGE("%s] Error from gnssNmeaCb nmea=%s length=%u description=%s",
__func__, gnssNmeaNotification.nmea, gnssNmeaNotification.length, __func__, gnssNmeaNotification.nmea, gnssNmeaNotification.length,
r.description().c_str()); r.description().c_str());
} }

View file

@ -170,7 +170,7 @@ void MeasurementAPIClient::measurementClose() {
void MeasurementAPIClient::onGnssMeasurementsCb( void MeasurementAPIClient::onGnssMeasurementsCb(
GnssMeasurementsNotification gnssMeasurementsNotification) GnssMeasurementsNotification gnssMeasurementsNotification)
{ {
LOC_LOGD("%s]: (count: %zu active: %d)", LOC_LOGD("%s]: (count: %u active: %d)",
__FUNCTION__, gnssMeasurementsNotification.count, mTracking); __FUNCTION__, gnssMeasurementsNotification.count, mTracking);
if (mTracking) { if (mTracking) {
mMutex.lock(); mMutex.lock();

View file

@ -1,7 +1,6 @@
GNSS_CFLAGS := \ GNSS_CFLAGS := \
-Werror \ -Werror \
-Wno-error=unused-parameter \ -Wno-error=unused-parameter \
-Wno-error=format \
-Wno-error=macro-redefined \ -Wno-error=macro-redefined \
-Wno-error=reorder \ -Wno-error=reorder \
-Wno-error=missing-braces \ -Wno-error=missing-braces \

View file

@ -404,7 +404,7 @@ void LocApiBase::reportSv(GnssSvNotification& svNotify)
"QZSS", "BEIDOU", "GALILEO" }; "QZSS", "BEIDOU", "GALILEO" };
// print the SV info before delivering // print the SV info before delivering
LOC_LOGV("num sv: %zu\n" LOC_LOGV("num sv: %u\n"
" sv: constellation svid cN0" " sv: constellation svid cN0"
" elevation azimuth flags", " elevation azimuth flags",
svNotify.count); svNotify.count);

View file

@ -1,7 +1,6 @@
GNSS_CFLAGS := \ GNSS_CFLAGS := \
-Werror \ -Werror \
-Wno-error=unused-parameter \ -Wno-error=unused-parameter \
-Wno-error=format \
-Wno-error=macro-redefined \ -Wno-error=macro-redefined \
-Wno-error=reorder \ -Wno-error=reorder \
-Wno-error=missing-braces \ -Wno-error=missing-braces \

View file

@ -48,7 +48,7 @@ namespace loc_util {
#define SOCK_OP_AND_LOG(buf, length, opable, rtv, exe) \ #define SOCK_OP_AND_LOG(buf, length, opable, rtv, exe) \
if (nullptr == (buf) || 0 == (length)) { \ if (nullptr == (buf) || 0 == (length)) { \
LOC_LOGe("Invalid inputs: buf - %p, length - %d", (buf), (length)); \ LOC_LOGe("Invalid inputs: buf - %p, length - %u", (buf), (length)); \
} else if (!(opable)) { \ } else if (!(opable)) { \
LOC_LOGe("Invalid object: operable - %d", (opable)); \ LOC_LOGe("Invalid object: operable - %d", (opable)); \
} else { \ } else { \
@ -60,7 +60,7 @@ namespace loc_util {
const char Sock::MSG_ABORT[] = "LocIpc::Sock::ABORT"; const char Sock::MSG_ABORT[] = "LocIpc::Sock::ABORT";
const char Sock::LOC_IPC_HEAD[] = "$MSGLEN$"; const char Sock::LOC_IPC_HEAD[] = "$MSGLEN$";
ssize_t Sock::send(const void *buf, size_t len, int flags, const struct sockaddr *destAddr, ssize_t Sock::send(const void *buf, uint32_t len, int flags, const struct sockaddr *destAddr,
socklen_t addrlen) const { socklen_t addrlen) const {
ssize_t rtv = -1; ssize_t rtv = -1;
SOCK_OP_AND_LOG(buf, len, isValid(), rtv, sendto(buf, len, flags, destAddr, addrlen)); SOCK_OP_AND_LOG(buf, len, isValid(), rtv, sendto(buf, len, flags, destAddr, addrlen));

View file

@ -164,7 +164,7 @@ public:
inline Sock(int sid, const uint32_t maxTxSize = 8192) : mMaxTxSize(maxTxSize), mSid(sid) {} inline Sock(int sid, const uint32_t maxTxSize = 8192) : mMaxTxSize(maxTxSize), mSid(sid) {}
inline ~Sock() { close(); } inline ~Sock() { close(); }
inline bool isValid() const { return -1 != mSid; } inline bool isValid() const { return -1 != mSid; }
ssize_t send(const void *buf, size_t len, int flags, const struct sockaddr *destAddr, ssize_t send(const void *buf, uint32_t len, int flags, const struct sockaddr *destAddr,
socklen_t addrlen) const; socklen_t addrlen) const;
ssize_t recv(const shared_ptr<ILocIpcListener>& dataCb, int flags, struct sockaddr *srcAddr, ssize_t recv(const shared_ptr<ILocIpcListener>& dataCb, int flags, struct sockaddr *srcAddr,
socklen_t *addrlen, int sid = -1) const; socklen_t *addrlen, int sid = -1) const;