Message ID | 20240229180746.1671015-1-denkenz@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 8165dc6c175f1d355b3c6e1f305d541fffbce895 |
Headers | show |
Series | [1/4] voicecall: Drop unused GError variables | expand |
Hello: This series was applied to ofono.git (master) by Denis Kenzior <denkenz@gmail.com>: On Thu, 29 Feb 2024 12:07:33 -0600 you wrote: > GError return variables would possibly be allocated by g_key_file_get_* > functions, but never used and never freed. Fix that. > --- > src/voicecall.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Here is the summary with links: - [1/4] voicecall: Drop unused GError variables https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=8165dc6c175f - [2/4] smsutil: ensure the address length in bytes <= 10 https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=a90421d8e45d - [3/4] smsutil: Check cbs_dcs_decode return value https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=7f2adfa22fba - [4/4] simutil: Make sure set_length on the parent succeeds https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=07f48b23e387 You are awesome, thank you!
diff --git a/src/voicecall.c b/src/voicecall.c index 725a166b0376..1bf96ee179b4 100644 --- a/src/voicecall.c +++ b/src/voicecall.c @@ -3438,10 +3438,9 @@ static void emulator_dial_callback(const struct ofono_error *error, void *data) gboolean need_to_emit; struct voicecall *v; char *number; - GError *err = NULL; number = g_key_file_get_string(vc->settings, SETTINGS_GROUP, - "Number", &err); + "Number", NULL); v = dial_handle_result(vc, error, number, &need_to_emit); @@ -3564,7 +3563,6 @@ static void emulator_bldn_cb(struct ofono_emulator *em, struct ofono_voicecall *vc = userdata; char *number = NULL; struct ofono_error result; - GError *error = NULL; switch (ofono_emulator_request_get_type(req)) { case OFONO_EMULATOR_REQUEST_TYPE_COMMAND_ONLY: @@ -3572,7 +3570,7 @@ static void emulator_bldn_cb(struct ofono_emulator *em, goto fail; number = g_key_file_get_string(vc->settings, SETTINGS_GROUP, - "Number", &error); + "Number", NULL); if (number == NULL || number[0] == '\0') goto fail;