commit 14e426684aec0ce295d6813e5dcb4d79145ab6a5
author Nathan Harold <nharold@google.com> Mon Jul 31 19:44:46 2017 -0700
committer Nathan Harold <nharold@google.com> Tue Aug 01 15:14:51 2017 -0700
tree 88dce09d06846b4a9cbb49dec14477155523d870
parent 72dd7d8af9032fa503e4017658c91c67855c9b3b

Fix Const-Correctness for RIL_RadioFunctions

Re-add constant for function pointer table to
RIL_RadioFunctions. Const was accidentally removed
during a warnings cleanup.

Bug: 64231560
Test: compilation
Change-Id: I93675980c51d9162f624495d12fe3c97f1da8031

rild/rild.c

diff --git a/rild/rild.c b/rild/rild.c
index ce04040..d324692 100644
--- a/rild/rild.c
+++ b/rild/rild.c
@@ -53,7 +53,7 @@
 extern void RIL_register (const RIL_RadioFunctions *callbacks);
 extern void rilc_thread_pool ();
 
-extern void RIL_register_socket (RIL_RadioFunctions *(*rilUimInit)
+extern void RIL_register_socket (const RIL_RadioFunctions *(*rilUimInit)
         (const struct RIL_Env *, int, char **), RIL_SOCKET_TYPE socketType, int argc, char **argv);
 
 extern void RIL_onRequestComplete(RIL_Token t, RIL_Errno e,
@@ -153,7 +153,7 @@
     // Pointer to ril init function in vendor ril
     const RIL_RadioFunctions *(*rilInit)(const struct RIL_Env *, int, char **);
     // Pointer to sap init function in vendor ril
-    RIL_RadioFunctions *(*rilUimInit)(const struct RIL_Env *, int, char **);
+    const RIL_RadioFunctions *(*rilUimInit)(const struct RIL_Env *, int, char **);
     const char *err_str = NULL;
 
     // functions returned by ril init function in vendor ril
@@ -231,7 +231,7 @@
 
     dlerror(); // Clear any previous dlerror
     rilUimInit =
-        (RIL_RadioFunctions *(*)(const struct RIL_Env *, int, char **))
+        (const RIL_RadioFunctions *(*)(const struct RIL_Env *, int, char **))
         dlsym(dlHandle, "RIL_SAP_Init");
     err_str = dlerror();
     if (err_str) {