[xiph-commits] r7164 - trunk/speex/libspeex

[conrad at dactyl.lonelymoon.com]

Author: conrad
Date: Thu Jul 15 23:32:12 2004
New Revision: 7164

Modified:
trunk/speex/libspeex/modes_noglobals.c
Log:
add some (void *) casts in calls to speex_free to stop random errors on
random compilers
... it must be almost time for beer


Modified: trunk/speex/libspeex/modes_noglobals.c
===================================================================
--- trunk/speex/libspeex/modes_noglobals.c	2004-07-16 06:20:46 UTC (rev 7163)
+++ trunk/speex/libspeex/modes_noglobals.c	2004-07-16 06:32:09 UTC (rev 7164)
@@ -89,7 +89,7 @@
static void
speex_ltp_params_free (const ltp_params * params)
{
-  speex_free (params);
+  speex_free ((void *)params);
}

static const split_cb_params *
@@ -114,7 +114,7 @@
static void
speex_split_cb_params_free (const split_cb_params * params)
{
-  speex_free (params);
+  speex_free ((void *)params);
}

static SpeexSubmode *
@@ -724,7 +724,7 @@
/* If nb_mode_new() was successful, the references to submodes have been
* copied into ret->submodes[], and it's safe to free submodes.
*/
-  speex_free (submodes);
+  speex_free ((void *)submodes);

return ret;

@@ -738,7 +738,7 @@
nb_2: speex_submode_free (submodes[2]);
nb_1: speex_submode_free (submodes[1]);

-  speex_free (submodes);
+  speex_free ((void *)submodes);

return NULL;
}
@@ -938,7 +938,7 @@
/* If sb_mode_new() was successful, the references to submodes have been
* copied into ret->submodes[], and it's safe to free submodes.
*/
-  speex_free (submodes);
+  speex_free ((void *)submodes);

return ret;

@@ -948,7 +948,7 @@
sb_2: speex_submode_free (submodes[2]);
sb_1: speex_submode_free (submodes[1]);

-  speex_free (submodes);
+  speex_free ((void *)submodes);

return NULL;
}
@@ -1040,13 +1040,13 @@
/* If sb_mode_new() was successful, the references to submodes have been
* copied into ret->submodes[], and it's safe to free submodes.
*/
-  speex_free (submodes);
+  speex_free ((void *)submodes);

return ret;

uwb_1: speex_submode_free (submodes[1]);

-  speex_free (submodes);
+  speex_free ((void *)submodes);

return NULL;
}