[RIL] 64-bit compile issues
- size_t use %zu format
- All in RLOG, so zero functional impact
- suppress unused argument warnings
Change-Id: I99d7221a13de6f12bfcf93ef8fe4521669f1f783
diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c
index 8bfd53d..0a35c6f 100644
--- a/reference-ril/reference-ril.c
+++ b/reference-ril/reference-ril.c
@@ -22,6 +22,7 @@
#include <string.h>
#include <errno.h>
#include <unistd.h>
+#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@ -396,12 +397,12 @@
static void requestOrSendDataCallList(RIL_Token *t);
-static void onDataCallListChanged(void *param)
+static void onDataCallListChanged(void *param __unused)
{
requestOrSendDataCallList(NULL);
}
-static void requestDataCallList(void *data, size_t datalen, RIL_Token t)
+static void requestDataCallList(void *data __unused, size_t datalen __unused, RIL_Token t)
{
requestOrSendDataCallList(&t);
}
@@ -595,7 +596,7 @@
}
static void requestQueryNetworkSelectionMode(
- void *data, size_t datalen, RIL_Token t)
+ void *data __unused, size_t datalen __unused, RIL_Token t)
{
int err;
ATResponse *p_response = NULL;
@@ -631,14 +632,14 @@
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
}
-static void sendCallStateChanged(void *param)
+static void sendCallStateChanged(void *param __unused)
{
RIL_onUnsolicitedResponse (
RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED,
NULL, 0);
}
-static void requestGetCurrentCalls(void *data, size_t datalen, RIL_Token t)
+static void requestGetCurrentCalls(void *data __unused, size_t datalen __unused, RIL_Token t)
{
int err;
ATResponse *p_response;
@@ -761,7 +762,7 @@
at_response_free(p_response);
}
-static void requestDial(void *data, size_t datalen, RIL_Token t)
+static void requestDial(void *data, size_t datalen __unused, RIL_Token t)
{
RIL_Dial *p_dial;
char *cmd;
@@ -788,7 +789,7 @@
RIL_onRequestComplete(t, RIL_E_SUCCESS, NULL, 0);
}
-static void requestWriteSmsToSim(void *data, size_t datalen, RIL_Token t)
+static void requestWriteSmsToSim(void *data, size_t datalen __unused, RIL_Token t)
{
RIL_SMS_WriteArgs *p_args;
char *cmd;
@@ -814,7 +815,7 @@
at_response_free(p_response);
}
-static void requestHangup(void *data, size_t datalen, RIL_Token t)
+static void requestHangup(void *data, size_t datalen __unused, RIL_Token t)
{
int *p_line;
@@ -836,7 +837,7 @@
RIL_onRequestComplete(t, RIL_E_SUCCESS, NULL, 0);
}
-static void requestSignalStrength(void *data, size_t datalen, RIL_Token t)
+static void requestSignalStrength(void *data __unused, size_t datalen __unused, RIL_Token t)
{
ATResponse *p_response = NULL;
int err;
@@ -884,8 +885,8 @@
}
return 0;
}
-static void requestSetPreferredNetworkType( int request, void *data,
- size_t datalen, RIL_Token t )
+static void requestSetPreferredNetworkType( int request __unused, void *data,
+ size_t datalen __unused, RIL_Token t )
{
ATResponse *p_response = NULL;
char *cmd = NULL;
@@ -931,8 +932,8 @@
RIL_onRequestComplete(t, RIL_E_SUCCESS, NULL, 0);
}
-static void requestGetPreferredNetworkType(int request, void *data,
- size_t datalen, RIL_Token t)
+static void requestGetPreferredNetworkType(int request __unused, void *data __unused,
+ size_t datalen __unused, RIL_Token t)
{
int preferred;
unsigned i;
@@ -956,8 +957,8 @@
}
-static void requestCdmaPrlVersion(int request, void *data,
- size_t datalen, RIL_Token t)
+static void requestCdmaPrlVersion(int request __unused, void *data __unused,
+ size_t datalen __unused, RIL_Token t)
{
int err;
char * responseStr;
@@ -980,8 +981,8 @@
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
}
-static void requestCdmaBaseBandVersion(int request, void *data,
- size_t datalen, RIL_Token t)
+static void requestCdmaBaseBandVersion(int request __unused, void *data __unused,
+ size_t datalen __unused, RIL_Token t)
{
int err;
char * responseStr;
@@ -999,8 +1000,8 @@
free(responseStr);
}
-static void requestCdmaDeviceIdentity(int request, void *data,
- size_t datalen, RIL_Token t)
+static void requestCdmaDeviceIdentity(int request __unused, void *data __unused,
+ size_t datalen __unused, RIL_Token t)
{
int err;
int response[4];
@@ -1036,8 +1037,8 @@
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
}
-static void requestCdmaGetSubscriptionSource(int request, void *data,
- size_t datalen, RIL_Token t)
+static void requestCdmaGetSubscriptionSource(int request __unused, void *data,
+ size_t datalen __unused, RIL_Token t)
{
int err;
int *ss = (int *)data;
@@ -1069,7 +1070,7 @@
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
}
-static void requestCdmaSetSubscriptionSource(int request, void *data,
+static void requestCdmaSetSubscriptionSource(int request __unused, void *data,
size_t datalen, RIL_Token t)
{
int err;
@@ -1101,8 +1102,8 @@
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
}
-static void requestCdmaSubscription(int request, void *data,
- size_t datalen, RIL_Token t)
+static void requestCdmaSubscription(int request __unused, void *data __unused,
+ size_t datalen __unused, RIL_Token t)
{
int err;
int response[5];
@@ -1129,8 +1130,8 @@
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
}
-static void requestCdmaGetRoamingPreference(int request, void *data,
- size_t datalen, RIL_Token t)
+static void requestCdmaGetRoamingPreference(int request __unused, void *data __unused,
+ size_t datalen __unused, RIL_Token t)
{
int roaming_pref = -1;
ATResponse *p_response = NULL;
@@ -1155,8 +1156,8 @@
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
}
-static void requestCdmaSetRoamingPreference(int request, void *data,
- size_t datalen, RIL_Token t)
+static void requestCdmaSetRoamingPreference(int request __unused, void *data,
+ size_t datalen __unused, RIL_Token t)
{
int *pref = (int *)data;
ATResponse *p_response = NULL;
@@ -1292,8 +1293,8 @@
#define REG_STATE_LEN 15
#define REG_DATA_STATE_LEN 6
-static void requestRegistrationState(int request, void *data,
- size_t datalen, RIL_Token t)
+static void requestRegistrationState(int request, void *data __unused,
+ size_t datalen __unused, RIL_Token t)
{
int err;
int *registration;
@@ -1406,7 +1407,7 @@
at_response_free(p_response);
}
-static void requestOperator(void *data, size_t datalen, RIL_Token t)
+static void requestOperator(void *data __unused, size_t datalen __unused, RIL_Token t)
{
int err;
int i;
@@ -1489,7 +1490,7 @@
RIL_SMS_Response response;
RIL_CDMA_SMS_Message* rcsm;
- RLOGD("requestCdmaSendSMS datalen=%d, sizeof(RIL_CDMA_SMS_Message)=%d",
+ RLOGD("requestCdmaSendSMS datalen=%zu, sizeof(RIL_CDMA_SMS_Message)=%zu",
datalen, sizeof(RIL_CDMA_SMS_Message));
// verify data content to test marshalling/unmarshalling:
@@ -1528,7 +1529,7 @@
ATResponse *p_response = NULL;
memset(&response, 0, sizeof(response));
- RLOGD("requestSendSMS datalen =%d", datalen);
+ RLOGD("requestSendSMS datalen =%zu", datalen);
if (s_ims_gsm_fail != 0) goto error;
if (s_ims_gsm_retry != 0) goto error2;
@@ -1576,7 +1577,7 @@
memset(&response, 0, sizeof(response));
- RLOGD("requestImsSendSMS: datalen=%d, "
+ RLOGD("requestImsSendSMS: datalen=%zu, "
"registered=%d, service=%d, format=%d, ims_perm_fail=%d, "
"ims_retry=%d, gsm_fail=%d, gsm_retry=%d",
datalen, s_ims_registered, s_ims_services, s_ims_format,
@@ -1737,7 +1738,7 @@
}
-static void requestSMSAcknowledge(void *data, size_t datalen, RIL_Token t)
+static void requestSMSAcknowledge(void *data, size_t datalen __unused, RIL_Token t)
{
int ackSuccess;
int err;
@@ -1759,7 +1760,7 @@
}
-static void requestSIM_IO(void *data, size_t datalen, RIL_Token t)
+static void requestSIM_IO(void *data, size_t datalen __unused, RIL_Token t)
{
ATResponse *p_response = NULL;
RIL_SIM_IO_Response sr;
@@ -1845,7 +1846,7 @@
}
-static void requestSendUSSD(void *data, size_t datalen, RIL_Token t)
+static void requestSendUSSD(void *data, size_t datalen __unused, RIL_Token t)
{
const char *ussdRequest;
@@ -1858,7 +1859,7 @@
}
-static void requestExitEmergencyMode(void *data, size_t datalen, RIL_Token t)
+static void requestExitEmergencyMode(void *data __unused, size_t datalen __unused, RIL_Token t)
{
int err;
ATResponse *p_response = NULL;
@@ -1897,7 +1898,7 @@
return ret;
}
-static void requestGetCellInfoList(void *data, size_t datalen, RIL_Token t)
+static void requestGetCellInfoList(void *data __unused, size_t datalen __unused, RIL_Token t)
{
uint64_t curTime = ril_nano_time();
RIL_CellInfo ci[1] =
@@ -2357,14 +2358,14 @@
*/
static int
-onSupports (int requestCode)
+onSupports (int requestCode __unused)
{
//@@@ todo
return 1;
}
-static void onCancel (RIL_Token t)
+static void onCancel (RIL_Token t __unused)
{
//@@@todo
@@ -2700,7 +2701,7 @@
* (all SMS-related commands)
*/
-static void pollSIMState (void *param)
+static void pollSIMState (void *param __unused)
{
ATResponse *p_response;
int ret;
@@ -2813,7 +2814,7 @@
return 0;
}
-int query_supported_techs( ModemInfo *mdm, int *supported )
+int query_supported_techs( ModemInfo *mdm __unused, int *supported )
{
ATResponse *p_response;
int err, val, techs = 0;
@@ -2852,7 +2853,7 @@
* 1 if only the current mode was returned by modem (or failed to parse preferred)
* 0 if both current and preferred were returned correctly
*/
-int query_ctec(ModemInfo *mdm, int *current, int32_t *preferred)
+int query_ctec(ModemInfo *mdm __unused, int *current, int32_t *preferred)
{
ATResponse *response = NULL;
int err;
@@ -2931,7 +2932,7 @@
* Initialize everything that can be configured while we're still in
* AT+CFUN=0
*/
-static void initializeCallback(void *param)
+static void initializeCallback(void *param __unused)
{
ATResponse *p_response = NULL;
int err;
@@ -3225,7 +3226,7 @@
}
static void *
-mainLoop(void *param)
+mainLoop(void *param __unused)
{
int fd;
int ret;