use the _x_abort() macro instead of abort, since it prints some debug info

before aborting

CVS patchset: 6211
CVS date: 2004/03/03 20:09:11

4 files changed, 23 insertions, 23 deletions

diff --git a/src/input/http_helper.c b/src/input/http_helper.c
index 730deccad..f58b6c8f4 100644
--- a/src/input/http_helper.c
+++ b/src/input/http_helper.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
  *
  * This file is part of xine, a free video player.
  *
@@ -19,7 +19,7 @@
  *
  * URL helper functions
  *
- * $Id: http_helper.c,v 1.1 2003/11/26 08:09:58 tmattern Exp $ 
+ * $Id: http_helper.c,v 1.2 2004/03/03 20:09:12 mroi Exp $ 
  */
 #include "xine_internal.h"
 #include "http_helper.h"
@@ -43,13 +43,13 @@ int _x_parse_url (char *url, char **proto, char** host, int *port,
   char   *end        = NULL;
   char   *strtol_err = NULL;
 
-  if (!url)      abort();
-  if (!proto)    abort();
-  if (!user)     abort();
-  if (!password) abort();
-  if (!host)     abort();
-  if (!port)     abort();
-  if (!uri)      abort();
+  if (!url)      _x_abort();
+  if (!proto)    _x_abort();
+  if (!user)     _x_abort();
+  if (!password) _x_abort();
+  if (!host)     _x_abort();
+  if (!port)     _x_abort();
+  if (!uri)      _x_abort();
 
   *proto    = NULL;
   *port     = 0;
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index 32a7aa632..fd2117a96 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
  * March 2003 - Miguel Freitas
  * This plugin was sponsored by 1Control
  *
@@ -38,7 +38,7 @@
  * usage: 
  *   xine pvr:/<prefix_to_tmp_files>\!<prefix_to_saved_files>\!<max_page_age>
  *
- * $Id: input_pvr.c,v 1.42 2004/02/16 20:19:09 uid86226 Exp $
+ * $Id: input_pvr.c,v 1.43 2004/03/03 20:09:12 mroi Exp $
  */
 
 /**************************************************************************
@@ -1425,7 +1425,7 @@ static int pvr_plugin_open (input_plugin_t *this_gen ) {
 			     NULL, pvr_loop, this)) != 0) {
     xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
 	     "input_pvr: can't create new thread (%s)\n", strerror(err));
-    abort();
+    _x_abort();
   }
   
   return 1;
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index 7a32662d5..648942531 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
  * 
  * This file is part of xine, a free video player.
  * 
@@ -601,7 +601,7 @@ static int rtp_plugin_open (input_plugin_t *this_gen ) {
   if ((err = pthread_create(&this->reader_thread, NULL, 
 		            input_plugin_read_loop, (void *)this)) != 0) {
     LOG_MSG(this->stream->xine, _("input_rtp: can't create new thread (%s)\n"), strerror(err));
-    abort();
+    _x_abort();
   }
   
   return 1;
diff --git a/src/input/libreal/asmrp.c b/src/input/libreal/asmrp.c
index c81247f66..4bdfd4d06 100644
--- a/src/input/libreal/asmrp.c
+++ b/src/input/libreal/asmrp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2003 the xine project
+ * Copyright (C) 2002-2004 the xine project
  *
  * This file is part of xine, a free video player.
  * 
@@ -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: asmrp.c,v 1.6 2003/12/09 00:02:30 f1rmb Exp $
+ * $Id: asmrp.c,v 1.7 2004/03/03 20:09:13 mroi Exp $
  *
  * a parser for real's asm rules
  *
@@ -412,7 +412,7 @@ static int asmrp_operand (asmrp_t *p) {
     
     if (p->sym != ASMRP_SYM_ID) {
       printf ("error: identifier expected.\n");
-      abort();
+      _x_abort();
     }
 
     i = asmrp_find_id (p, p->str);
@@ -437,7 +437,7 @@ static int asmrp_operand (asmrp_t *p) {
 
     if (p->sym != ASMRP_SYM_RPAREN) {
       printf ("error: ) expected.\n");
-      abort();
+      _x_abort();
     }
 
     asmrp_get_sym (p);
@@ -445,7 +445,7 @@ static int asmrp_operand (asmrp_t *p) {
 
   default:
     lprintf ("syntax error, $ number or ( expected\n");
-    abort();
+    _x_abort();
   }
 
   lprintf ("operand done, =%d\n", ret);
@@ -536,20 +536,20 @@ static void asmrp_assignment (asmrp_t *p) {
 
   if (p->sym != ASMRP_SYM_ID) {
     printf ("error: identifier expected\n");
-    abort ();
+    _x_abort ();
   }
   asmrp_get_sym (p);
 
   if (p->sym != ASMRP_SYM_EQUALS) {
     printf ("error: = expected\n");
-    abort ();
+    _x_abort ();
   }
   asmrp_get_sym (p);
 
   if ( (p->sym != ASMRP_SYM_NUM) && (p->sym != ASMRP_SYM_STRING) 
        && (p->sym != ASMRP_SYM_ID)) {
     printf ("error: number or string expected\n");
-    abort ();
+    _x_abort ();
   }
   asmrp_get_sym (p);
 
@@ -591,7 +591,7 @@ static int asmrp_rule (asmrp_t *p) {
 
   if (p->sym != ASMRP_SYM_SEMICOLON) {
     printf ("semicolon expected.\n");
-    abort ();
+    _x_abort ();
   }
 
   asmrp_get_sym (p);