commit 5d891b7991dd22c105e97180e0fb02d4b42911eb
author Etan Cohen <etancohen@google.com> Thu Feb 27 17:25:17 2014 -0800
committer Etan Cohen <etancohen@google.com> Fri Feb 28 19:22:42 2014 +0000
tree 4da0f57a15486bd02df09e69e69b4db26fa2e4ac
parent ebdf40e65a17e8758c059a736425cd47563cdace

[RIL] Fix build-break when enabling RILC_LOG

A couple of debug messages were using out-of-date struct
members causing the build to break when the RILC_LOG flag
was enabled.

Change-Id: I258a58744aa3c71ddbe09e598221c149be59b554

libril/ril.cpp

diff --git a/libril/ril.cpp b/libril/ril.cpp
index 03a075f..2f1f8c7 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -1106,7 +1106,8 @@
     rism.messageRef = messageRef;
 
     startRequest;
-    appendPrintBuf("%sformat=%d,", printBuf, rism.format);
+    appendPrintBuf("%stech=%d, retry=%d, messageRef=%d, ", printBuf,
+                    (int)rism.tech, (int)rism.retry, rism.messageRef);
     if (countStrings == 0) {
         // just some non-null pointer
         pStrings = (char **)alloca(sizeof(char *));
@@ -1550,8 +1551,8 @@
     pf.password = strdupReadString(p);
 
     startRequest;
-    appendPrintBuf("%sapn=%s, protocol=%s, auth_type=%d, username=%s, password=%s",
-            printBuf, pf.apn, pf.protocol, pf.auth_type, pf.username, pf.password);
+    appendPrintBuf("%sapn=%s, protocol=%s, authtype=%d, username=%s, password=%s",
+            printBuf, pf.apn, pf.protocol, pf.authtype, pf.username, pf.password);
     closeRequest;
     printRequest(pRI->token, pRI->pCI->requestNumber);