wlan: hdd: Fix additional logging format/argument mismatches
Previously change "wlan: hdd: fix logging format/argument mismatch"
fixed some instances of mismatches between format and argument in
invocations of logging APIs in the hdd code. Recent analysis has
uncovered additional mismatches, so fix them.
Change-Id: Ia4e7e45559d45b1bff2e49a6fa8cfac4d08debee
CRs-fixed: 570511
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index e9fbffe..5adfd45 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -449,8 +449,9 @@
ftEvent.ies = (u8 *)(ftIe + SIR_MAC_ADDR_LENGTH);
ftEvent.ies_len = auth_resp_len - SIR_MAC_ADDR_LENGTH;
- hddLog(LOG1, "%s ftEvent.ies_len %d",__FUNCTION__, ftEvent.ies_len);
- hddLog(LOG1, "%s ftEvent.ric_ies_len %d",__FUNCTION__, ftEvent.ric_ies_len );
+ hddLog(LOG1, "%s ftEvent.ies_len %zu", __FUNCTION__, ftEvent.ies_len);
+ hddLog(LOG1, "%s ftEvent.ric_ies_len %zu",
+ __FUNCTION__, ftEvent.ric_ies_len );
hddLog(LOG1, "%s ftEvent.target_ap %2x-%2x-%2x-%2x-%2x-%2x ",
__FUNCTION__, ftEvent.target_ap[0], ftEvent.target_ap[1],
ftEvent.target_ap[2], ftEvent.target_ap[3], ftEvent.target_ap[4],
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 6679a76..e8ce2c7 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -2974,7 +2974,7 @@
goto config_exit;
}
- hddLog(LOG1, "%s: qcom_cfg.ini Size %d\n",__func__, fw->size);
+ hddLog(LOG1, "%s: qcom_cfg.ini Size %zu", __func__, fw->size);
buffer = (char*)vos_mem_malloc(fw->size);
@@ -4877,7 +4877,7 @@
// too big
hddLog(LOGE,
"%s: invalid command, string [%s] length "
- "%u exceeds maximum length %u",
+ "%zu exceeds maximum length %u",
__func__, value_str,
len_value_str, (pRegEntry->VarSize - 1));
goto done;
@@ -4893,7 +4893,7 @@
// out of range
hddLog(LOGE,
"%s: invalid command, MAC address [%s] length "
- "%u is not expected length %u",
+ "%zu is not expected length %u",
__func__, value_str,
len_value_str, (VOS_MAC_ADDR_SIZE * 2));
goto done;
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index a4ee77e..7cb2c3b 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -7760,13 +7760,13 @@
// Added for debug on reception of Re-assoc Req.
if (eConnectionState_Associated != pHddStaCtx->conn_info.connState)
{
- hddLog(LOGE, FL("Called with Ie of length = %d when not associated\n"),
+ hddLog(LOGE, FL("Called with Ie of length = %zu when not associated\n"),
ftie->ie_len);
hddLog(LOGE, FL("Should be Re-assoc Req IEs\n"));
}
#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
- hddLog(LOGE, FL("%s called with Ie of length = %d\n"), __func__,
+ hddLog(LOGE, FL("%s called with Ie of length = %zu\n"), __func__,
ftie->ie_len);
#endif
@@ -7995,7 +7995,7 @@
}
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "request->ie_len = %d", request->ie_len);
+ "request->ie_len = %zu", request->ie_len);
if ((0 < request->ie_len) && (NULL != request->ie))
{
pPnoRequest->us24GProbeTemplateLen = request->ie_len;
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index a155932..adcdb52 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -2701,8 +2701,7 @@
{
if(pAdapter->aStaInfo[i].isUsed)
{
- len = scnprintf(pBuf, buf_len, "%*d .%02x:%02x:%02x:%02x:%02x:%02x\n",
- strlen("staId"),
+ len = scnprintf(pBuf, buf_len, "%5d .%02x:%02x:%02x:%02x:%02x:%02x\n",
pAdapter->aStaInfo[i].ucSTAId,
pAdapter->aStaInfo[i].macAddrSTA.bytes[0],
pAdapter->aStaInfo[i].macAddrSTA.bytes[1],
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index 0ce7886..d0be7d0 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -1693,7 +1693,7 @@
if (data == NULL)
{
- hddLog( LOGE, FL("Not Able to Push %d byte to skb"), cfgState->len);
+ hddLog( LOGE, FL("Not Able to Push %zu byte to skb"), cfgState->len);
kfree_skb( cfgState->skb );
return;
}
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index cb0d8e1..4be49b5 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -5843,8 +5843,9 @@
}
/* Debug display of request components. */
- hddLog(VOS_TRACE_LEVEL_INFO, "%s: Set Keep Alive Request : TimePeriod %d size %d",
- __func__,pRequest->timePeriod, sizeof(tKeepAliveRequest));
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ "%s: Set Keep Alive Request : TimePeriod %d size %zu",
+ __func__, pRequest->timePeriod, sizeof(tKeepAliveRequest));
switch (pRequest->packetType)
{