Xine assert() replacement:

All assert() function calls, with exceptions of libdvdread and libdvdnav, have been
replaced with XINE_ASSERT. Functionally XINE_ASSERT behaves just likes its predecesor but its
adding the ability to print out a stack trace at the point where the assertion fails.
So here are a few examples.
assert (0);
This use of assert was found in a couple locations most favorably being the default case of a switch
statement. This was the only thing there. So if the switch statement was unable to find a match
it would have defaulted to this and the user and the developers would be stuck wonder who died and where.
So it has been replaced with
XINE_ASSERT(0, "We have reach this point and don't have a default case");
It may seem a bit none descriptive but there is more going on behind the scene.
In addition to checking a condition is true/false, in this case '0', the XINE_ASSERT
prints out:
<filename>:<function name>:<line number> - assertion '<assertion expression>' failed. <description>
An example of this might be:
input_dvd.c:open_plugin:1178 - assertion '0' failed. xine_malloc failed!!! You have run out of memory
XINE_ASSERT and its helper function, print_trace, are found in src/xine-utils/xineutils.h

CVS patchset: 4301
CVS date: 2003/02/28 02:51:47

3 files changed, 11 insertions, 14 deletions

diff --git a/src/libfaad/cfft.c b/src/libfaad/cfft.c
index a8a6537af..a834c73da 100644
--- a/src/libfaad/cfft.c
+++ b/src/libfaad/cfft.c
@@ -16,7 +16,7 @@
 ** along with this program; if not, write to the Free Software 
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 **
-** $Id: cfft.c,v 1.4 2003/01/31 01:20:26 storri Exp $
+** $Id: cfft.c,v 1.5 2003/02/28 02:51:48 storri Exp $
 **/
 
 /*
@@ -32,11 +32,6 @@
 #include "structs.h"
 
 #include <stdlib.h>
-#ifdef _WIN32_WCE
-#define assert(x)
-#else
-#include <assert.h>
-#endif
 
 #include "cfft.h"
 #include "cfft_tab.h"
diff --git a/src/libfaad/filtbank.c b/src/libfaad/filtbank.c
index 24cc03780..d17c95473 100644
--- a/src/libfaad/filtbank.c
+++ b/src/libfaad/filtbank.c
@@ -16,7 +16,7 @@
 ** along with this program; if not, write to the Free Software 
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 **
-** $Id: filtbank.c,v 1.3 2002/12/16 19:00:02 miguelfreitas Exp $
+** $Id: filtbank.c,v 1.4 2003/02/28 02:51:49 storri Exp $
 **/
 
 #include "common.h"
@@ -25,9 +25,9 @@
 #include <stdlib.h>
 #include <string.h>
 #ifdef _WIN32_WCE
-#define assert(x)
+#define XINE_ASSERT(x)
 #else
-#include <assert.h>
+#include "xineutils.h"
 #endif
 
 #include "filtbank.h"
@@ -265,7 +265,9 @@ void filter_bank_ltp(fb_info *fb, uint8_t window_sequence, uint8_t window_shape,
     uint16_t nshort = frame_len/8;
     uint16_t nflat_ls = (nlong-nshort)/2;
 
-    assert(window_sequence != EIGHT_SHORT_SEQUENCE);
+    XINE_ASSERT(window_sequence != EIGHT_SHORT_SEQUENCE,
+		"%window_sequence (%d) == EIGHT_SHORT_SEQUENCE (%d)",
+		window_sequence, EIGHT_SHORT_SEQUENCE);
 
     windowed_buf = (real_t*)malloc(nlong*2*sizeof(real_t));
 
diff --git a/src/libfaad/mdct.c b/src/libfaad/mdct.c
index 62031bfed..0f2e3bda7 100644
--- a/src/libfaad/mdct.c
+++ b/src/libfaad/mdct.c
@@ -16,7 +16,7 @@
 ** along with this program; if not, write to the Free Software 
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 **
-** $Id: mdct.c,v 1.3 2002/12/16 19:00:39 miguelfreitas Exp $
+** $Id: mdct.c,v 1.4 2003/02/28 02:51:49 storri Exp $
 **/
 
 /*
@@ -40,9 +40,9 @@
 
 #include <stdlib.h>
 #ifdef _WIN32_WCE
-#define assert(x)
+#define XINE_ASSERT(x)
 #else
-#include <assert.h>
+#include "xineutils.h"
 #endif
 
 #include "cfft.h"
@@ -115,7 +115,7 @@ mdct_info *faad_mdct_init(uint16_t N)
 
     mdct_info *mdct = (mdct_info*)malloc(sizeof(mdct_info));
 
-    assert(N % 8 == 0);
+    XINE_ASSERT( (N % 8 == 0), "?");
 
     mdct->N = N;
     mdct->sincos = (complex_t*)malloc(N/4*sizeof(complex_t));