diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-12-10 02:22:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-12-10 02:22:00 +0000 |
| commit | caeb590d0af0828f3b3825533bce5b205bccea65 (patch) | |
| tree | 50e67f1d44f274837279cffe5b40da3dc6537d4f /modules | |
| parent | 49f990fb86da1320c4ed2daaa18167ebf876b49f (diff) | |
| parent | 3f31ee2d2ac292b2efc55ef9b41e1a15784b74da (diff) | |
| download | libhardware-caeb590d0af0828f3b3825533bce5b205bccea65.tar.gz | |
Merge "Fix sizeof warnings on unusual calloc" am: 4ca44e7615 am: 3f31ee2d2a
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2337324
Change-Id: I57129773e0e1007c0b774daaf5d898da6736ee44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/soundtrigger/sound_trigger_hw.c | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/modules/soundtrigger/sound_trigger_hw.c b/modules/soundtrigger/sound_trigger_hw.c index 38212c45..cae91cab 100644 --- a/modules/soundtrigger/sound_trigger_hw.c +++ b/modules/soundtrigger/sound_trigger_hw.c @@ -246,12 +246,10 @@ static void unload_all_sound_models(struct stub_sound_trigger_device *stdev); static char *sound_trigger_keyphrase_event_alloc(sound_model_handle_t handle, struct sound_trigger_recognition_config *config, int recognition_status) { - char *data; - struct sound_trigger_phrase_recognition_event *event; - data = (char *)calloc(1, sizeof(struct sound_trigger_phrase_recognition_event)); - if (!data) + struct sound_trigger_phrase_recognition_event *event = + calloc(1, sizeof(struct sound_trigger_phrase_recognition_event)); + if (!event) return NULL; - event = (struct sound_trigger_phrase_recognition_event *)data; event->common.status = recognition_status; event->common.type = SOUND_MODEL_TYPE_KEYPHRASE; event->common.model = handle; @@ -279,18 +277,16 @@ static char *sound_trigger_keyphrase_event_alloc(sound_model_handle_t handle, event->common.audio_config.sample_rate = 16000; event->common.audio_config.channel_mask = AUDIO_CHANNEL_IN_MONO; event->common.audio_config.format = AUDIO_FORMAT_PCM_16_BIT; - return data; + return (char*) event; } static char *sound_trigger_generic_event_alloc(sound_model_handle_t handle, struct sound_trigger_recognition_config *config, int recognition_status) { - char *data; - struct sound_trigger_generic_recognition_event *event; - data = (char *)calloc(1, sizeof(struct sound_trigger_generic_recognition_event)); - if (!data) + struct sound_trigger_generic_recognition_event *event = + calloc(1, sizeof(struct sound_trigger_generic_recognition_event)); + if (!event) return NULL; - event = (struct sound_trigger_generic_recognition_event *)data; event->common.status = recognition_status; event->common.type = SOUND_MODEL_TYPE_GENERIC; event->common.model = handle; @@ -301,7 +297,7 @@ static char *sound_trigger_generic_event_alloc(sound_model_handle_t handle, event->common.audio_config.sample_rate = 16000; event->common.audio_config.channel_mask = AUDIO_CHANNEL_IN_MONO; event->common.audio_config.format = AUDIO_FORMAT_PCM_16_BIT; - return data; + return (char*) event; } void send_event_with_handle(sound_model_handle_t* model_handle_str, @@ -338,15 +334,13 @@ void send_event_with_handle(sound_model_handle_t* model_handle_str, ALOGI("Unknown Sound Model Type, No Event to Send"); } } else if (event_type == EVENT_SOUND_MODEL) { - char *data; - data = (char *)calloc(1, sizeof(struct sound_trigger_model_event)); - if (!data) { + struct sound_trigger_model_event *event = + calloc(1, sizeof(struct sound_trigger_model_event)); + if (!event) { ALOGW("%s Could not allocate event", __func__); return; } - struct sound_trigger_model_event *event; - event = (struct sound_trigger_model_event *)data; event->status = SOUND_MODEL_STATUS_UPDATED; event->model = model_context->model_handle; if (event) { |