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, 10 insertions, 10 deletions

diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 80cd57641..775152640 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.c
@@ -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: configfile.c,v 1.58 2003/12/05 15:55:04 f1rmb Exp $
+ * $Id: configfile.c,v 1.59 2003/12/07 15:34:30 f1rmb Exp $
  *
  * config object (was: file) management - implementation
  *
@@ -203,8 +203,8 @@ static char *__config_register_string (config_values_t *this,
 
   cfg_entry_t *entry, *prev;
 
-  XINE_ASSERT(key, "Register key is NULL. This is a required argument.");
-  XINE_ASSERT(def_value, "Default value is NULL. This is a required argument.");
+  _x_assert(key);
+  _x_assert(def_value);
 
   lprintf ("registering %s\n", key);
 
@@ -266,7 +266,7 @@ static int __config_register_num (config_values_t *this,
 				  void *cb_data) {
 
   cfg_entry_t *entry, *prev;
-  XINE_ASSERT(key, "Register key is NULL. This is a required argument.");
+  _x_assert(key);
 
   lprintf ("registering %s\n", key);
 
@@ -331,7 +331,7 @@ static int __config_register_bool (config_values_t *this,
 				   void *cb_data) {
 
   cfg_entry_t *entry, *prev;
-  XINE_ASSERT(key, "Register key is NULL. This is a required argument.");
+  _x_assert(key);
 
   lprintf ("registering %s\n", key);
 
@@ -397,7 +397,7 @@ static int __config_register_range (config_values_t *this,
 				    void *cb_data) {
 
   cfg_entry_t *entry, *prev;
-  XINE_ASSERT(key, "Register key is NULL. This is a required argument.");
+  _x_assert(key);
 
   lprintf ("registering range %s\n", key);
 
@@ -489,8 +489,8 @@ static int __config_register_enum (config_values_t *this,
 				   void *cb_data) {
 
   cfg_entry_t *entry, *prev;
-  XINE_ASSERT(key, "Register key is NULL. This is a required argument.");
-  XINE_ASSERT(values, "Argument 'values' is NULL. This is a required argument.");
+  _x_assert(key);
+  _x_assert(values);
 
   lprintf ("registering enum %s\n", key);
 
@@ -909,8 +909,8 @@ static void __config_unregister_cb (config_values_t *this, const char *key) {
 
   cfg_entry_t *entry;
 
-  XINE_ASSERT(key, "Register key is NULL. This is a required argument.");
-  XINE_ASSERT(this, "Argument 'this' is NULL. Cannot find key if this is not set.");
+  _x_assert(key);
+  _x_assert(this);
 
   entry = __config_lookup_entry (this, key);
   if (entry) {