From a189a6883ee55cf62da1d7bf5bf5a8ab501938a4 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Mon, 20 Feb 2012 12:16:30 -0800 Subject: Use struct assignment instead of explicit memcpy for POD structs effect_descriptor_t and effect_config_t Change-Id: Ib2fc47f85fb65ed91b0abb1f87217c49b5eb571d --- media/libmedia/AudioEffect.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'media/libmedia/AudioEffect.cpp') diff --git a/media/libmedia/AudioEffect.cpp b/media/libmedia/AudioEffect.cpp index 34451ca..680604b 100644 --- a/media/libmedia/AudioEffect.cpp +++ b/media/libmedia/AudioEffect.cpp @@ -122,19 +122,12 @@ status_t AudioEffect::set(const effect_uuid_t *type, mSessionId = sessionId; memset(&mDescriptor, 0, sizeof(effect_descriptor_t)); - memcpy(&mDescriptor.type, EFFECT_UUID_NULL, sizeof(effect_uuid_t)); - memcpy(&mDescriptor.uuid, EFFECT_UUID_NULL, sizeof(effect_uuid_t)); - - if (type != NULL) { - memcpy(&mDescriptor.type, type, sizeof(effect_uuid_t)); - } - if (uuid != NULL) { - memcpy(&mDescriptor.uuid, uuid, sizeof(effect_uuid_t)); - } + mDescriptor.type = *(type != NULL ? type : EFFECT_UUID_NULL); + mDescriptor.uuid = *(uuid != NULL ? uuid : EFFECT_UUID_NULL); mIEffectClient = new EffectClient(this); - iEffect = audioFlinger->createEffect(getpid(), (effect_descriptor_t *)&mDescriptor, + iEffect = audioFlinger->createEffect(getpid(), &mDescriptor, mIEffectClient, priority, io, mSessionId, &mStatus, &mId, &enabled); if (iEffect == 0 || (mStatus != NO_ERROR && mStatus != ALREADY_EXISTS)) { -- cgit v1.1