commit 5449b7ace698eb6b6b51df97fa39066100cc40e8
author Jeff Johnson <jjohnson@qca.qualcomm.com> Fri Nov 22 18:39:00 2013 -0800
committer Kiet Lam <kietl@codeaurora.org> Sun Dec 15 17:10:37 2013 -0800
tree d0148b267e21bda053196128681be69d67ae1673
parent 1012a095690059a5b4aed5c33981b2742d1acb82

wlan: sme: Fix additional logging format/argument mismatches

Previously change "wlan: sme: fix logging format/argument mismatch"
fixed some instances of mismatches between format and argument in
invocations of logging APIs in the sme code.  Recent analysis has
uncovered additional mismatches, so fix them.

CRs-fixed: 570511
Change-Id: Id6afccae47f6a2c350028c99ca06a55fa67db5ed

CORE/SME/src/csr/csrApiScan.c

diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 34f3b1b..b0539ec 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -261,11 +261,11 @@
                 }
                 else
                 {
-                    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL, 
-                         " %d Detect 1 list(0x%X) error Head(0x%X) next(0x%X) Count %d, dest(0x%X) src(0x%X) numBytes(%d)",
-                         idx, (unsigned int)g_pchannelPowerInfoList24, (unsigned int)pHead, 
-                        (unsigned int)(pHead->next), (int)g_pchannelPowerInfoList24->Count, 
-                        (unsigned int)dest, (unsigned int)src, (int)num);
+                    VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL,
+                         " %d Detect 1 list(%p) error Head(%p) next(%p) Count %d, dest(%p) src(%p) numBytes(%d)",
+                         idx, g_pchannelPowerInfoList24, pHead,
+                        (pHead->next), (int)g_pchannelPowerInfoList24->Count,
+                        dest, src, (int)num);
                     VOS_ASSERT(0);
                     ii = 0;
                     break;
@@ -275,10 +275,10 @@
         else
         {
             //Bad list
-            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL, " %d Detect list(0x%X) error Head(0x%X) next(0x%X) Count %d, dest(0x%X) src(0x%X) numBytes(%d)", 
-                idx, (unsigned int)g_pchannelPowerInfoList24, (unsigned int)pHead, 
-                (unsigned int)(pHead->next), (int)g_pchannelPowerInfoList24->Count, 
-                (unsigned int)dest, (unsigned int)src, (int)num);
+            VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_FATAL, " %d Detect list(%p) error Head(%p) next(%p) Count %d, dest(%p) src(%p) numBytes(%d)",
+                idx, g_pchannelPowerInfoList24, pHead,
+                (pHead->next), (int)g_pchannelPowerInfoList24->Count,
+                dest, src, (int)num);
             VOS_ASSERT(0);
             ii = 0;
         }
@@ -4151,7 +4151,7 @@
                 }
             }
         }
-        smsLog(pMac, LOG3, FL("  %d sets each one is %d"), pIesLocal->Country.num_triplets, sizeof(tSirMacChanInfo));
+        smsLog(pMac, LOG3, FL("  %d sets each one is %zu"), pIesLocal->Country.num_triplets, sizeof(tSirMacChanInfo));
 
         // set the indicator of the channel where the country IE was found...
         pMac->scan.channelOf11dInfo = pSirBssDesc->channelId;

CORE/SME/src/sme_common/sme_Api.c

diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 6ca9684..2afd2d0 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -6927,7 +6927,7 @@
          }
          else
          {
-            smsLog(pMac, LOGE, FL(" not enough data length %d needed %d"),
+            smsLog(pMac, LOGE, FL(" not enough data length %u needed %zu"),
                pPrefNetworkFoundInd->mesgLen, sizeof(tSirPrefNetworkFoundInd));
          }