get rid of XINE_{ASSERT,ABORT} and useless xine_print_trace (useless). Replace XINE_ASSERT by _x_assert, which works exaclty as assert, except that it still warns with NDEBUG defined (but don't abort). Fix missuning of assert(0), which isn't safe, abort is abort, assert is for debugging purpose only, so all assert(0) has been converted to abort() alls. In osd_preload_fonts(): alloc needed memory chunk. Define NDEBUG in CFLAGS, for non DEBUG build only.

CVS patchset: 5860
CVS date: 2003/12/07 15:34:29

1 files changed, 4 insertions, 3 deletions

diff --git a/src/input/libdvdnav/nav_read.c b/src/input/libdvdnav/nav_read.c
index e4114034a..c76aa55a8 100644
--- a/src/input/libdvdnav/nav_read.c
+++ b/src/input/libdvdnav/nav_read.c
@@ -19,6 +19,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
 #include <assert.h>
@@ -51,7 +52,7 @@ static uint32_t getbits(getbits_state_t *state, uint32_t number_of_bits) {
   uint8_t byte=0;
   if (number_of_bits > 32) {
     printf("Number of bits > 32 in getbits\n");
-    assert(0);
+    abort();
   }
 
   if ((state->bit_position) > 0) {  /* Last getbits left us in the middle of a byte. */
@@ -123,7 +124,7 @@ static uint32_t get32bits(getbits_state_t *state) {
 void navRead_PCI(pci_t *pci, unsigned char *buffer) {
   int32_t i, j;
   getbits_state_t state;
-  if (getbits_init(&state, buffer)) assert(0); /* Passed NULL pointers */
+  if (getbits_init(&state, buffer)) abort(); /* Passed NULL pointers */
 
   /* pci pci_gi */
   pci->pci_gi.nv_pck_lbn = getbits(&state, 32 );
@@ -291,7 +292,7 @@ void navRead_PCI(pci_t *pci, unsigned char *buffer) {
 void navRead_DSI(dsi_t *dsi, unsigned char *buffer) {
   int i;
   getbits_state_t state;
-  if (getbits_init(&state, buffer)) assert(0); /* Passed NULL pointers */
+  if (getbits_init(&state, buffer)) abort(); /* Passed NULL pointers */
 
   /* dsi dsi gi */
   dsi->dsi_gi.nv_pck_scr = getbits(&state, 32 );