From: Mahmoud Mandour <ma.mandourr@gmail.com>
To: qemu-devel@nongnu.org
Cc: Mahmoud Mandour <ma.mandourr@gmail.com>,
Gerd Hoffmann <kraxel@redhat.com>
Subject: [PATCH 2/8] hw/audio/fmopl.c: Fixing some style errors
Date: Sun, 14 Mar 2021 05:23:18 +0200 [thread overview]
Message-ID: <20210314032324.45142-3-ma.mandourr@gmail.com> (raw)
In-Reply-To: <20210314032324.45142-1-ma.mandourr@gmail.com>
Fixed style errors on the relevant lines in which
I will introduce changes.
Signed-off-by: Mahmoud Mandour <ma.mandourr@gmail.com>
---
hw/audio/fmopl.c | 58 ++++++++++++++++++++++++++----------------------
1 file changed, 32 insertions(+), 26 deletions(-)
diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c
index 8a71a569fa..51b773695a 100644
--- a/hw/audio/fmopl.c
+++ b/hw/audio/fmopl.c
@@ -607,26 +607,32 @@ static int OPLOpenTable( void )
double pom;
/* allocate dynamic tables */
- if( (TL_TABLE = malloc(TL_MAX*2*sizeof(int32_t))) == NULL)
- return 0;
- if( (SIN_TABLE = malloc(SIN_ENT*4 *sizeof(int32_t *))) == NULL)
- {
- free(TL_TABLE);
- return 0;
- }
- if( (AMS_TABLE = malloc(AMS_ENT*2 *sizeof(int32_t))) == NULL)
- {
- free(TL_TABLE);
- free(SIN_TABLE);
- return 0;
- }
- if( (VIB_TABLE = malloc(VIB_ENT*2 *sizeof(int32_t))) == NULL)
- {
- free(TL_TABLE);
- free(SIN_TABLE);
- free(AMS_TABLE);
- return 0;
- }
+ TL_TABLE = malloc(TL_MAX * 2 * sizeof(int32_t));
+ if (TL_TABLE == NULL) {
+ return 0;
+ }
+
+ SIN_TABLE = malloc(SIN_ENT * 4 * sizeof(int32_t *));
+ if (SIN_TABLE == NULL) {
+ free(TL_TABLE);
+ return 0;
+ }
+
+ AMS_TABLE = malloc(AMS_ENT * 2 * sizeof(int32_t));
+ if (AMS_TABLE == NULL) {
+ free(TL_TABLE);
+ free(SIN_TABLE);
+ return 0;
+ }
+
+ VIB_TABLE = malloc(VIB_ENT * 2 * sizeof(int32_t));
+ if (VIB_TABLE == NULL) {
+ free(TL_TABLE);
+ free(SIN_TABLE);
+ free(AMS_TABLE);
+ return 0;
+ }
+
ENV_CURVE = g_new(int32_t, 2 * EG_ENT + 1);
/* make total level table */
for (t = 0;t < EG_ENT-1 ;t++){
@@ -696,10 +702,10 @@ static int OPLOpenTable( void )
static void OPLCloseTable( void )
{
g_free(ENV_CURVE);
- free(TL_TABLE);
- free(SIN_TABLE);
- free(AMS_TABLE);
- free(VIB_TABLE);
+ free(TL_TABLE);
+ free(SIN_TABLE);
+ free(AMS_TABLE);
+ free(VIB_TABLE);
}
/* CSM Key Control */
@@ -1082,7 +1088,7 @@ FM_OPL *OPLCreate(int clock, int rate)
state_size = sizeof(FM_OPL);
state_size += sizeof(OPL_CH)*max_ch;
/* allocate memory block */
- ptr = malloc(state_size);
+ ptr = malloc(state_size);
if(ptr==NULL) return NULL;
/* clear */
memset(ptr,0,state_size);
@@ -1128,7 +1134,7 @@ void OPLDestroy(FM_OPL *OPL)
}
#endif
OPL_UnLockTable();
- free(OPL);
+ free(OPL);
}
/* ---------- Option handlers ---------- */
--
2.25.1
next prev parent reply other threads:[~2021-03-14 3:26 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-14 3:23 [PATCH 0/8] Replacing malloc and the like with GLib's variants Mahmoud Mandour
2021-03-14 3:23 ` [PATCH 1/8] bsd-user/elfload.c: Replaced calls to malloc/free with GLib variants Mahmoud Mandour
2021-03-15 16:07 ` Alex Bennée
2021-03-15 16:22 ` Mahmoud Mandour
2021-03-15 17:56 ` Alex Bennée
2021-03-14 3:23 ` Mahmoud Mandour [this message]
2021-03-14 3:23 ` [PATCH 3/8] hw/audio/fmopl.c: Replaced calls to malloc with GLib's variants Mahmoud Mandour
2021-03-15 16:12 ` Alex Bennée
2021-03-15 17:35 ` Mahmoud Mandour
2021-03-14 3:23 ` [PATCH 4/8] target/xtensa: Replaced malloc/free " Mahmoud Mandour
2021-03-14 15:38 ` Max Filippov
2021-03-14 3:23 ` [PATCH 5/8] util/compatfd.c: Replaced a malloc with GLib's variant Mahmoud Mandour
2021-03-15 6:10 ` Thomas Huth
2021-03-15 6:43 ` Mahmoud Mandour
2021-03-15 7:29 ` Thomas Huth
2021-03-15 16:15 ` Alex Bennée
2021-03-14 3:23 ` [PATCH 6/8] tools/virtiofsd/buffer.c: replaced a calloc call with GLib's g_try_new0 Mahmoud Mandour
2021-03-15 9:53 ` Stefan Hajnoczi
2021-05-25 19:01 ` Dr. David Alan Gilbert
2021-03-14 3:23 ` [PATCH 7/8] tools/virtiofsd/fuse_opt.c: Replaced a malloc with GLib's g_try_malloc Mahmoud Mandour
2021-03-15 9:54 ` Stefan Hajnoczi
2021-03-14 3:23 ` [PATCH 8/8] tools/virtiofsd: Replacing malloc-like calls with GLib's variants Mahmoud Mandour
2021-03-15 10:01 ` Stefan Hajnoczi
2021-03-15 10:46 ` Mahmoud Mandour
2021-03-16 17:23 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210314032324.45142-3-ma.mandourr@gmail.com \
--to=ma.mandourr@gmail.com \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).