diff options
| author | Tomasz Wasilczyk <twasilczyk@google.com> | 2017-04-11 09:21:08 -0700 |
|---|---|---|
| committer | Tomasz Wasilczyk <twasilczyk@google.com> | 2017-04-12 14:24:15 -0700 |
| commit | 88961c2a2feb543bc6f63b42eeaa112ddca5d6e3 (patch) | |
| tree | bd136b637da3d008a53e4dd7073c386ee5ae4a41 /reference-ril | |
| parent | e7b2a3d1f6fa8bb5111a4b3ac92c9b5c324eb515 (diff) | |
| download | android_hardware_ril-88961c2a2feb543bc6f63b42eeaa112ddca5d6e3.tar.gz android_hardware_ril-88961c2a2feb543bc6f63b42eeaa112ddca5d6e3.tar.bz2 android_hardware_ril-88961c2a2feb543bc6f63b42eeaa112ddca5d6e3.zip | |
Fix warnings and set Werror flags to not let them happen again.
Test: it builds.
Bug: b/37159108
Change-Id: I3b0d6376d81615774b60e71a6eebf6f38224df88
Diffstat (limited to 'reference-ril')
| -rw-r--r-- | reference-ril/Android.mk | 1 | ||||
| -rw-r--r-- | reference-ril/reference-ril.c | 13 |
2 files changed, 3 insertions, 11 deletions
diff --git a/reference-ril/Android.mk b/reference-ril/Android.mk index 08681c1..3abf38b 100644 --- a/reference-ril/Android.mk +++ b/reference-ril/Android.mk @@ -18,6 +18,7 @@ LOCAL_STATIC_LIBRARIES := libqemu_pipe libbase # for asprinf LOCAL_CFLAGS := -D_GNU_SOURCE +LOCAL_CFLAGS += -Wall -Wextra -Wno-unused-variable -Wno-unused-function -Werror LOCAL_C_INCLUDES := diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c index 42fa254..8b79f62 100644 --- a/reference-ril/reference-ril.c +++ b/reference-ril/reference-ril.c @@ -803,9 +803,11 @@ static void requestGetCurrentCalls(void *data __unused, size_t datalen __unused, } return; +#ifdef WORKAROUND_ERRONEOUS_ANSWER error: RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0); at_response_free(p_response); +#endif } static void requestDial(void *data, size_t datalen __unused, RIL_Token t) @@ -1079,12 +1081,6 @@ static void requestCdmaDeviceIdentity(int request __unused, void *data __unused, RIL_onRequestComplete(t, RIL_E_SUCCESS, responseStr, count*sizeof(char*)); at_response_free(p_response); - - return; -error: - RLOGE("requestCdmaDeviceIdentity must never return an error when radio is on"); - at_response_free(p_response); - RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0); } static void requestCdmaGetSubscriptionSource(int request __unused, void *data, @@ -1173,11 +1169,6 @@ static void requestCdmaSubscription(int request __unused, void *data __unused, responseStr[3] = "8587777777"; // MIN responseStr[4] = "1"; // PRL Version RIL_onRequestComplete(t, RIL_E_SUCCESS, responseStr, count*sizeof(char*)); - - return; -error: - RLOGE("requestRegistrationState must never return an error when radio is on"); - RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0); } static void requestCdmaGetRoamingPreference(int request __unused, void *data __unused, |