diff options
author | nharold <nharold@google.com> | 2017-08-02 19:11:39 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-02 19:11:39 +0000 |
commit | bfbd7b4ce6c3eed657562a26bf8166d7d8605afa (patch) | |
tree | f589dcc8fe2120b5e8292e342b27de9ae294e7ef /rild | |
parent | 06ee397dc41902270a94c598d9da39b57c6ddfc3 (diff) | |
parent | e7a8d0f196b08554144eb8f7c8f9433ac680074d (diff) | |
download | android_hardware_ril-bfbd7b4ce6c3eed657562a26bf8166d7d8605afa.tar.gz android_hardware_ril-bfbd7b4ce6c3eed657562a26bf8166d7d8605afa.tar.bz2 android_hardware_ril-bfbd7b4ce6c3eed657562a26bf8166d7d8605afa.zip |
Merge "Fix Const-Correctness for RIL_RadioFunctions"
am: e7a8d0f196
Change-Id: Ib3c88204dbf5dcc8850c09250177492c65df1df2
Diffstat (limited to 'rild')
-rw-r--r-- | rild/rild.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rild/rild.c b/rild/rild.c index fb4955a..96bd2ff 100644 --- a/rild/rild.c +++ b/rild/rild.c @@ -52,7 +52,7 @@ extern char ril_service_name[MAX_SERVICE_NAME_LENGTH]; 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, @@ -107,7 +107,7 @@ int main(int argc, char **argv) { // 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 @@ -183,7 +183,7 @@ int main(int argc, char **argv) { 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) { |