summaryrefslogtreecommitdiff
path: root/src/xine-utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-utils')
-rw-r--r--src/xine-utils/xine_buffer.c24
-rw-r--r--src/xine-utils/xineutils.h24
-rw-r--r--src/xine-utils/xmllexer.c12
-rw-r--r--src/xine-utils/xmlparser.c26
4 files changed, 47 insertions, 39 deletions
diff --git a/src/xine-utils/xine_buffer.c b/src/xine-utils/xine_buffer.c
index d99adbc49..e69a36c04 100644
--- a/src/xine-utils/xine_buffer.c
+++ b/src/xine-utils/xine_buffer.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: xine_buffer.c,v 1.6 2003/12/05 15:55:05 f1rmb Exp $
+ * $Id: xine_buffer.c,v 1.7 2003/12/06 18:11:55 mroi Exp $
*
*
* generic dynamic buffer functions. The goals
@@ -138,7 +138,7 @@ void *_xine_buffer_free(void *buf) {
#ifdef CHECKS
if (!buf) {
- lprintf("xine_buffer_free: warning: got NULL pointer\n");
+ lprintf("warning: got NULL pointer\n");
return NULL;
}
CHECK_MAGIC(buf);
@@ -158,7 +158,7 @@ void *xine_buffer_dup(void *buf) {
#ifdef CHECKS
if (!buf) {
- lprintf("xine_buffer_dup: warning: got NULL pointer\n");
+ lprintf("warning: got NULL pointer\n");
return NULL;
}
CHECK_MAGIC(buf);
@@ -181,7 +181,7 @@ void *_xine_buffer_copyin(void *buf, int index, const void *data, int len) {
#ifdef CHECKS
if (!buf || !data) {
- lprintf("xine_buffer_copyin: warning: got NULL pointer\n");
+ lprintf("warning: got NULL pointer\n");
return NULL;
}
CHECK_MAGIC(buf);
@@ -203,7 +203,7 @@ void xine_buffer_copyout(void *buf, int index, void *data, int len) {
#ifdef CHECKS
if (!buf || !data) {
- lprintf("xine_buffer_copyout: warning: got NULL pointer\n");
+ lprintf("warning: got NULL pointer\n");
return;
}
CHECK_MAGIC(buf);
@@ -211,7 +211,7 @@ void xine_buffer_copyout(void *buf, int index, void *data, int len) {
if (GET_HEADER(buf)->size < index+len)
{
- lprintf("xine_buffer_copyout: warning: attempt to read over boundary!\n");
+ lprintf("warning: attempt to read over boundary!\n");
if (GET_HEADER(buf)->size < index)
return;
len = GET_HEADER(buf)->size - index;
@@ -228,7 +228,7 @@ void *_xine_buffer_set(void *buf, int index, uint8_t b, int len) {
#ifdef CHECKS
if (!buf) {
- lprintf("xine_buffer_set: warning: got NULL pointer\n");
+ lprintf("warning: got NULL pointer\n");
return NULL;
}
CHECK_MAGIC(buf);
@@ -251,7 +251,7 @@ void *_xine_buffer_strcat(void *buf, char *data) {
#ifdef CHECKS
if (!buf || !data) {
- lprintf("xine_buffer_strcat: warning: got NULL pointer\n");
+ lprintf("warning: got NULL pointer\n");
return NULL;
}
CHECK_MAGIC(buf);
@@ -273,7 +273,7 @@ void *_xine_buffer_strcpy(void *buf, int index, char *data) {
#ifdef CHECKS
if (!buf || !data) {
- lprintf("xine_buffer_strcpy: warning: got NULL pointer\n");
+ lprintf("warning: got NULL pointer\n");
return NULL;
}
CHECK_MAGIC(buf);
@@ -294,7 +294,7 @@ void *_xine_buffer_strcpy(void *buf, int index, char *data) {
char *xine_buffer_strchr(void *buf, int ch) {
#ifdef CHECKS
if (!buf) {
- lprintf("xine_buffer_get_size: warning: got NULL pointer\n");
+ lprintf("warning: got NULL pointer\n");
return 0;
}
CHECK_MAGIC(buf);
@@ -310,7 +310,7 @@ int xine_buffer_get_size(void *buf) {
#ifdef CHECKS
if (!buf) {
- lprintf("xine_buffer_get_size: warning: got NULL pointer\n");
+ lprintf("warning: got NULL pointer\n");
return 0;
}
CHECK_MAGIC(buf);
@@ -330,7 +330,7 @@ void *_xine_buffer_ensure_size(void *buf, int size) {
#ifdef CHECKS
if (!buf) {
- lprintf("xine_buffer_ensure_size: warning: got NULL pointer\n");
+ lprintf("warning: got NULL pointer\n");
return 0;
}
CHECK_MAGIC(buf);
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index 989a4b9cb..74b419b4b 100644
--- a/src/xine-utils/xineutils.h
+++ b/src/xine-utils/xineutils.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: xineutils.h,v 1.68 2003/12/05 15:55:05 f1rmb Exp $
+ * $Id: xineutils.h,v 1.69 2003/12/06 18:11:55 mroi Exp $
*
*/
#ifndef XINEUTILS_H
@@ -585,7 +585,7 @@ typedef union {
TODO : fix dll linkage problem for xine_fast_memcpy on win32
xine_fast_memcpy dll linkage is screwy here.
- declairing as dllinport seems to fix the problem
+ declairing as dllimport seems to fix the problem
but causes compiler warning with libxineutils
*/
#ifdef _MSC_VER
@@ -833,6 +833,17 @@ void xine_hexdump (const char *buf, int length);
/* backtrace printout funtion for use in XINE_ASSERT() macro */
void xine_print_trace(void);
+/*
+ * Optimization macros for conditions
+ * Taken from the FIASCO L4 microkernel sources
+ */
+#if !defined(__GNUC__) || __GNUC__ < 3
+# define EXPECT_TRUE(x) (x)
+# define EXPECT_FALSE(x) (x)
+#else
+# define EXPECT_TRUE(x) __builtin_expect((x),1)
+# define EXPECT_FALSE(x) __builtin_expect((x),0)
+#endif
#ifdef DEBUG
# define XINE_ABORT() \
@@ -973,8 +984,7 @@ void xine_print_trace(void);
#ifdef __GNUC__
#define xprintf(xine, verbose, fmt, args...) \
do { \
- if((xine)->verbosity >= verbose){ \
- LOG_MODULE_STRING \
+ if((xine) && (xine)->verbosity >= verbose){ \
xine_log(xine, XINE_LOG_TRACE, fmt, ##args); \
} \
} while(0)
@@ -982,16 +992,14 @@ void xine_print_trace(void);
#ifdef _MSC_VER
#define xprintf(xine, verbose, fmtargs) \
do { \
- if((xine)->verbosity >= verbose){ \
- LOG_MODULE_STRING \
+ if((xine) && (xine)->verbosity >= verbose){ \
xine_log(xine, XINE_LOG_TRACE, fmtargs); \
} \
} while(0)
#else
#define xprintf(xine, verbose, ...) \
do { \
- if((xine)->verbosity >= verbose){ \
- LOG_MODULE_STRING \
+ if((xine) && (xine)->verbosity >= verbose){ \
xine_log(xine, XINE_LOG_TRACE, __VA_ARGS__); \
} \
} while(0)
diff --git a/src/xine-utils/xmllexer.c b/src/xine-utils/xmllexer.c
index f41dbbdc6..b72865e07 100644
--- a/src/xine-utils/xmllexer.c
+++ b/src/xine-utils/xmllexer.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: xmllexer.c,v 1.5 2003/12/05 15:55:05 f1rmb Exp $
+ * $Id: xmllexer.c,v 1.6 2003/12/06 18:11:55 mroi Exp $
*
*/
@@ -347,7 +347,7 @@ int lexer_get_token(char * tok, int tok_size) {
}
break;
default:
- lprintf("xmllexer: expected char \'%c\'\n", tok[tok_pos - 1]); /* FIX ME */
+ lprintf("expected char \'%c\'\n", tok[tok_pos - 1]); /* FIX ME */
return T_ERROR;
}
} else {
@@ -368,7 +368,7 @@ int lexer_get_token(char * tok, int tok_size) {
/* pb */
if (tok_pos >= tok_size) {
- lprintf("xmllexer: token buffer is too little\n");
+ lprintf("token buffer is too little\n");
} else {
if (lexbuf_pos >= lexbuf_size) {
/* Terminate the current token */
@@ -398,15 +398,15 @@ int lexer_get_token(char * tok, int tok_size) {
return T_DATA;
break;
default:
- lprintf("xmllexer: unknown state, state=%d\n", state);
+ lprintf("unknown state, state=%d\n", state);
}
} else {
- lprintf("xmllexer: abnormal end of buffer, state=%d\n", state);
+ lprintf("abnormal end of buffer, state=%d\n", state);
}
}
return T_ERROR;
}
/* tok == null */
- lprintf("xmllexer: token buffer is null\n");
+ lprintf("token buffer is null\n");
return T_ERROR;
}
diff --git a/src/xine-utils/xmlparser.c b/src/xine-utils/xmlparser.c
index b232a1931..c36cb849b 100644
--- a/src/xine-utils/xmlparser.c
+++ b/src/xine-utils/xmlparser.c
@@ -18,7 +18,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: xmlparser.c,v 1.12 2003/12/05 15:55:05 f1rmb Exp $
+ * $Id: xmlparser.c,v 1.13 2003/12/06 18:11:53 mroi Exp $
*
*/
@@ -209,7 +209,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r
lprintf("info: node data : %s\n", current_node->data);
break;
default:
- lprintf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
+ lprintf("error: unexpected token \"%s\", state %d\n", tok, state);
return -1;
break;
}
@@ -230,7 +230,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r
lprintf("info: current node name \"%s\"\n", node_name);
break;
default:
- lprintf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
+ lprintf("error: unexpected token \"%s\", state %d\n", tok, state);
return -1;
break;
}
@@ -296,7 +296,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r
lprintf("info: current property name \"%s\"\n", property_name);
break;
default:
- lprintf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
+ lprintf("error: unexpected token \"%s\", state %d\n", tok, state);
return -1;
break;
}
@@ -312,12 +312,12 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r
if (strcmp(tok, root_name) == 0) {
state = 4;
} else {
- lprintf("xmlparser: error: xml struct, tok=%s, waited_tok=%s\n", tok, root_name);
+ lprintf("error: xml struct, tok=%s, waited_tok=%s\n", tok, root_name);
return -1;
}
break;
default:
- lprintf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
+ lprintf("error: unexpected token \"%s\", state %d\n", tok, state);
return -1;
break;
}
@@ -330,7 +330,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r
return 0;
break;
default:
- lprintf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
+ lprintf("error: unexpected token \"%s\", state %d\n", tok, state);
return -1;
break;
}
@@ -365,7 +365,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r
state = 2;
break;
default:
- lprintf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
+ lprintf("error: unexpected token \"%s\", state %d\n", tok, state);
return -1;
break;
}
@@ -394,7 +394,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r
state = 2;
break;
default:
- lprintf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state);
+ lprintf("error: unexpected token \"%s\", state %d\n", tok, state);
return -1;
break;
}
@@ -438,16 +438,16 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r
default:
- lprintf("xmlparser: error: unknown parser state, state=%d\n", state);
+ lprintf("error: unknown parser state, state=%d\n", state);
return -1;
}
}
/* lex error */
- lprintf("xmlparser: error: lexer error\n");
+ lprintf("error: lexer error\n");
return -1;
} else {
/* max recursion */
- lprintf("xmlparser: error: max recursion\n");
+ lprintf("error: max recursion\n");
return -1;
}
}
@@ -463,7 +463,7 @@ int xml_parser_build_tree(xml_node_t **root_node) {
free_xml_node(tmp_node);
res = 0;
} else {
- lprintf("xmlparser: error: xml struct\n");
+ lprintf("error: xml struct\n");
xml_parser_free_tree(tmp_node);
res = -1;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-03 07:50:03 +0000