summaryrefslogtreecommitdiff
path: root/src/input/input_plugin.h
diff options
context:
space:
mode:
authorStephen Torri <storri@users.sourceforge.net>2003-02-28 02:51:47 +0000
committerStephen Torri <storri@users.sourceforge.net>2003-02-28 02:51:47 +0000
commit49327f43ca2196122a60314e67eeee929efea873 (patch)
tree1b9ce1d2b141d0e411e422df265f6d57183906e1 /src/input/input_plugin.h
parent7eb769e2d3c1abb16e53d87af5f8633967e7f6ce (diff)
downloadxine-lib-49327f43ca2196122a60314e67eeee929efea873.tar.gz
xine-lib-49327f43ca2196122a60314e67eeee929efea873.tar.bz2
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
Diffstat (limited to 'src/input/input_plugin.h')
-rw-r--r--src/input/input_plugin.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h
index d0600bb43..853cb986c 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.45 2003/02/13 16:24:27 mroi Exp $
+ * $Id: input_plugin.h,v 1.46 2003/02/28 02:51:48 storri Exp $
*/
#ifndef HAVE_INPUT_PLUGIN_H
@@ -25,7 +25,7 @@
#include <inttypes.h>
#include <sys/types.h>
-#include <assert.h>
+#include "xineutils.h"
#include "buffer.h"
#include "configfile.h"
@@ -305,8 +305,8 @@ struct input_plugin_s {
* Duplicate two mrls entries (s = source, d = destination).
*/
#define MRL_DUPLICATE(s, d) { \
- assert((s) != NULL); \
- assert((d) != NULL); \
+ XINE_ASSERT((s) != NULL, "value 's' is NULL"); \
+ XINE_ASSERT((d) != NULL, "value 'd' is NULL"); \
\
if((s)->origin) { \
if((d)->origin) { \
@@ -351,8 +351,8 @@ struct input_plugin_s {
#define MRLS_DUPLICATE(s, d) { \
int i = 0; \
\
- assert((s) != NULL); \
- assert((d) != NULL); \
+ XINE_ASSERT((s) != NULL, "value 's' is NULL"); \
+ XINE_ASSERT((d) != NULL, "value 'd' is NULL"); \
\
while((s) != NULL) { \
d[i] = (xine_mrl_t *) malloc(sizeof(xine_mrl_t)); \