diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-12-07 15:34:29 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-12-07 15:34:29 +0000 |
| commit | c8fdff20285b59cd892297317572fbb4c3633f78 (patch) | |
| tree | 102be6141b635eb2bff16358ca13b79924b211f4 /src/input/input_plugin.h | |
| parent | a2dcf860b2777e530646abd00202c3fb5b3a5a81 (diff) | |
| download | xine-lib-c8fdff20285b59cd892297317572fbb4c3633f78.tar.gz xine-lib-c8fdff20285b59cd892297317572fbb4c3633f78.tar.bz2 | |
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
Diffstat (limited to 'src/input/input_plugin.h')
| -rw-r--r-- | src/input/input_plugin.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h index f578bcb99..9181f46c5 100644 --- a/src/input/input_plugin.h +++ b/src/input/input_plugin.h @@ -17,7 +17,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: input_plugin.h,v 1.53 2003/11/23 23:20:57 valtri Exp $ + * $Id: input_plugin.h,v 1.54 2003/12/07 15:34:30 f1rmb Exp $ */ #ifndef HAVE_INPUT_PLUGIN_H @@ -328,8 +328,8 @@ struct input_plugin_s { * Duplicate two mrls entries (s = source, d = destination). */ #define MRL_DUPLICATE(s, d) { \ - XINE_ASSERT((s) != NULL, "value 's' is NULL"); \ - XINE_ASSERT((d) != NULL, "value 'd' is NULL"); \ + _x_assert((s) != NULL); \ + _x_assert((d) != NULL); \ \ if((s)->origin) { \ if((d)->origin) { \ @@ -374,11 +374,11 @@ struct input_plugin_s { #define MRLS_DUPLICATE(s, d) { \ int i = 0; \ \ - XINE_ASSERT((s) != NULL, "value 's' is NULL"); \ - XINE_ASSERT((d) != NULL, "value 'd' is NULL"); \ + _x_assert((s) != NULL); \ + _x_assert((d) != NULL); \ \ while((s) != NULL) { \ - d[i] = (xine_mrl_t *) malloc(sizeof(xine_mrl_t)); \ + d[i] = (xine_mrl_t *) malloc(sizeof(xine_mrl_t)); \ MRL_DUPLICATE(s[i], d[i]); \ i++; \ } \ |