diff options
Diffstat (limited to 'src/xine-utils')
| -rw-r--r-- | src/xine-utils/cpu_accel.c | 12 | ||||
| -rw-r--r-- | src/xine-utils/memcpy.c | 15 | ||||
| -rw-r--r-- | src/xine-utils/xine_buffer.c | 53 | ||||
| -rw-r--r-- | src/xine-utils/xmllexer.c | 36 | ||||
| -rw-r--r-- | src/xine-utils/xmlparser.c | 73 |
5 files changed, 77 insertions, 112 deletions
diff --git a/src/xine-utils/cpu_accel.c b/src/xine-utils/cpu_accel.c index d0f328112..33a168aea 100644 --- a/src/xine-utils/cpu_accel.c +++ b/src/xine-utils/cpu_accel.c @@ -28,12 +28,14 @@ #include <setjmp.h> #include <dlfcn.h> -#include "xineutils.h" - +#define LOG_MODULE "cpu_accel" +#define LOG_VERBOSE /* -#define LOG +#define LOG */ +#include "xineutils.h" + #if defined(ARCH_X86) || defined(ARCH_X86_64) #if defined __x86_64__ static uint32_t arch_accel (void) @@ -208,9 +210,7 @@ uint32_t xine_mm_accel (void) old_sigill_handler = signal (SIGILL, sigill_handler); if (setjmp(sigill_return)) { -#ifdef LOG - printf ("cpu_accel: OS doesn't support SSE instructions.\n"); -#endif + lprintf ("OS doesn't support SSE instructions.\n"); accel &= ~(MM_ACCEL_X86_SSE|MM_ACCEL_X86_SSE2); } else { __asm__ volatile ("xorps %xmm0, %xmm0"); diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c index f9951a9e3..ca6c4444a 100644 --- a/src/xine-utils/memcpy.c +++ b/src/xine-utils/memcpy.c @@ -43,6 +43,13 @@ #include <stdlib.h> #include <string.h> + +#define LOG_MODULE "memcpy" +#define LOG_VERBOSE +/* +#define LOG +*/ + #include "xine_internal.h" void *(* xine_fast_memcpy)(void *to, const void *from, size_t len); @@ -440,9 +447,7 @@ static void update_fast_memcpy(void *this_gen, xine_cfg_entry_t *entry) { if (method != 0 && (config_flags & memcpy_method[method].cpu_require) == memcpy_method[method].cpu_require ) { -#ifdef LOG - printf("xine: using %s\n", memcpy_method[method].name ); -#endif + lprintf("using %s\n", memcpy_method[method].name ); xine_fast_memcpy = memcpy_method[method].function; return; } else { @@ -480,9 +485,7 @@ void xine_probe_fast_memcpy(config_values_t *config) if( best != 0 && (config_flags & memcpy_method[best].cpu_require) == memcpy_method[best].cpu_require ) { -#ifdef LOG - printf("xine: using %s\n", memcpy_method[best].name ); -#endif + lprintf("using %s\n", memcpy_method[best].name ); xine_fast_memcpy = memcpy_method[best].function; return; } diff --git a/src/xine-utils/xine_buffer.c b/src/xine-utils/xine_buffer.c index 47d580439..42623895b 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.4 2003/09/16 02:12:54 storri Exp $ + * $Id: xine_buffer.c,v 1.5 2003/11/26 19:43:38 f1rmb Exp $ * * * generic dynamic buffer functions. The goals @@ -53,9 +53,14 @@ #include <stdio.h> #include <string.h> #include <inttypes.h> -#include "xineutils.h" +#define LOG_MODULE "xine_buffer" +#define LOG_VERBOSE +/* #define LOG +*/ + +#include "xineutils.h" #define CHECKS @@ -133,9 +138,7 @@ void *_xine_buffer_free(void *buf) { #ifdef CHECKS if (!buf) { -#ifdef LOG - printf("xine_buffer_free: warning: got NULL pointer\n"); -#endif + lprintf("xine_buffer_free: warning: got NULL pointer\n"); return NULL; } CHECK_MAGIC(buf); @@ -155,9 +158,7 @@ void *xine_buffer_dup(void *buf) { #ifdef CHECKS if (!buf) { -#ifdef LOG - printf("xine_buffer_dup: warning: got NULL pointer\n"); -#endif + lprintf("xine_buffer_dup: warning: got NULL pointer\n"); return NULL; } CHECK_MAGIC(buf); @@ -180,9 +181,7 @@ void *_xine_buffer_copyin(void *buf, int index, const void *data, int len) { #ifdef CHECKS if (!buf || !data) { -#ifdef LOG - printf("xine_buffer_copyin: warning: got NULL pointer\n"); -#endif + lprintf("xine_buffer_copyin: warning: got NULL pointer\n"); return NULL; } CHECK_MAGIC(buf); @@ -204,9 +203,7 @@ void xine_buffer_copyout(void *buf, int index, void *data, int len) { #ifdef CHECKS if (!buf || !data) { -#ifdef LOG - printf("xine_buffer_copyout: warning: got NULL pointer\n"); -#endif + lprintf("xine_buffer_copyout: warning: got NULL pointer\n"); return; } CHECK_MAGIC(buf); @@ -231,9 +228,7 @@ void *_xine_buffer_set(void *buf, int index, uint8_t b, int len) { #ifdef CHECKS if (!buf) { -#ifdef LOG - printf("xine_buffer_set: warning: got NULL pointer\n"); -#endif + lprintf("xine_buffer_set: warning: got NULL pointer\n"); return NULL; } CHECK_MAGIC(buf); @@ -256,9 +251,7 @@ void *_xine_buffer_strcat(void *buf, char *data) { #ifdef CHECKS if (!buf || !data) { -#ifdef LOG - printf("xine_buffer_strcat: warning: got NULL pointer\n"); -#endif + lprintf("xine_buffer_strcat: warning: got NULL pointer\n"); return NULL; } CHECK_MAGIC(buf); @@ -280,9 +273,7 @@ void *_xine_buffer_strcpy(void *buf, int index, char *data) { #ifdef CHECKS if (!buf || !data) { -#ifdef LOG - printf("xine_buffer_strcpy: warning: got NULL pointer\n"); -#endif + lprintf("xine_buffer_strcpy: warning: got NULL pointer\n"); return NULL; } CHECK_MAGIC(buf); @@ -303,9 +294,7 @@ void *_xine_buffer_strcpy(void *buf, int index, char *data) { char *xine_buffer_strchr(void *buf, int ch) { #ifdef CHECKS if (!buf) { -#ifdef LOG - printf("xine_buffer_get_size: warning: got NULL pointer\n"); -#endif + lprintf("xine_buffer_get_size: warning: got NULL pointer\n"); return 0; } CHECK_MAGIC(buf); @@ -321,9 +310,7 @@ int xine_buffer_get_size(void *buf) { #ifdef CHECKS if (!buf) { -#ifdef LOG - printf("xine_buffer_get_size: warning: got NULL pointer\n"); -#endif + lprintf("xine_buffer_get_size: warning: got NULL pointer\n"); return 0; } CHECK_MAGIC(buf); @@ -342,10 +329,8 @@ int xine_buffer_get_size(void *buf) { void *_xine_buffer_ensure_size(void *buf, int size) { #ifdef CHECKS - if (!buf) { -#ifdef LOG - printf("xine_buffer_ensure_size: warning: got NULL pointer\n"); -#endif + if (!buf) { + lprintf("xine_buffer_ensure_size: warning: got NULL pointer\n"); return 0; } CHECK_MAGIC(buf); @@ -355,5 +340,3 @@ void *_xine_buffer_ensure_size(void *buf, int size) { return buf; } - - diff --git a/src/xine-utils/xmllexer.c b/src/xine-utils/xmllexer.c index 153a6cf32..e99ac692d 100644 --- a/src/xine-utils/xmllexer.c +++ b/src/xine-utils/xmllexer.c @@ -17,10 +17,17 @@ * 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.3 2003/09/16 02:12:54 storri Exp $ + * $Id: xmllexer.c,v 1.4 2003/11/26 19:43:38 f1rmb Exp $ * */ +#define LOG_MODULE "xmllexer" +#define LOG_VERBOSE +/* +#define LOG +*/ + +#include "xineutils.h" #include "xmllexer.h" #include <stdio.h> #include <ctype.h> @@ -30,10 +37,6 @@ #define NORMAL 0 /* normal lex mode */ #define DATA 1 /* data lex mode */ -/* -#define LOG -*/ - /* private global variables */ static char * lexbuf; static int lexbuf_size = 0; @@ -47,9 +50,8 @@ void lexer_init(char * buf, int size) { lexbuf_pos = 0; lex_mode = NORMAL; in_comment = 0; -#ifdef LOG - printf("xmllexer: buffer length %d\n", size); -#endif + + lprintf("buffer length %d\n", size); } int lexer_get_token(char * tok, int tok_size) { @@ -60,9 +62,8 @@ int lexer_get_token(char * tok, int tok_size) { if (tok) { while ((tok_pos < tok_size) && (lexbuf_pos < lexbuf_size)) { c = lexbuf[lexbuf_pos]; -#ifdef LOG - printf("xmllexer: c=%c, state=%d, in_comment=%d\n", c, state, in_comment); -#endif + lprintf("c=%c, state=%d, in_comment=%d\n", c, state, in_comment); + if (lex_mode == NORMAL) { /* normal mode */ switch (state) { @@ -108,7 +109,7 @@ int lexer_get_token(char * tok, int tok_size) { tok_pos++; break; - case '\"': + case '\"': /* " */ state = 7; break; @@ -220,7 +221,7 @@ int lexer_get_token(char * tok, int tok_size) { case 7: tok[tok_pos] = c; lexbuf_pos++; - if (c == '\"') { + if (c == '\"') { /* " */ tok[tok_pos] = '\0'; /* FIXME */ return T_STRING; } @@ -320,7 +321,7 @@ int lexer_get_token(char * tok, int tok_size) { case '<': case '>': case '\\': - case '\"': + case '\"': /* " */ case ' ': case '\t': case '=': @@ -362,10 +363,9 @@ int lexer_get_token(char * tok, int tok_size) { } } } -#ifdef LOG - printf ("xmllexer: loop done tok_pos = %d, tok_size=%d, lexbuf_pos=%d, lexbuf_size=%d\n", - tok_pos, tok_size, lexbuf_pos, lexbuf_size); -#endif + lprintf ("loop done tok_pos = %d, tok_size=%d, lexbuf_pos=%d, lexbuf_size=%d\n", + tok_pos, tok_size, lexbuf_pos, lexbuf_size); + /* pb */ if (tok_pos >= tok_size) { printf("xmllexer: token buffer is too little\n"); diff --git a/src/xine-utils/xmlparser.c b/src/xine-utils/xmlparser.c index b3d63a56e..e7a06f65d 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.10 2003/10/28 13:48:45 valtri Exp $ + * $Id: xmlparser.c,v 1.11 2003/11/26 19:43:38 f1rmb Exp $ * */ @@ -28,6 +28,14 @@ #include <string.h> #include <stdarg.h> #include <ctype.h> + +#define LOG_MODULE "xmlparser" +#define LOG_VERBOSE +/* +#define LOG +*/ + +#include "xineutils.h" #include "xmllexer.h" #include "xmlparser.h" @@ -36,10 +44,6 @@ #define DATA_SIZE 4 * 1024 #define MAX_RECURSION 10 -/* -#define LOG -*/ - /* private global variables */ static int xml_parser_mode; @@ -111,9 +115,8 @@ static void xml_parser_free_props(xml_property_t *current_property) { } static void xml_parser_free_tree_rec(xml_node_t *current_node, int free_next) { -#ifdef LOG - printf("xml_parser: xml_parser_free_tree_rec: %s\n", current_node->name); -#endif + lprintf("xml_parser_free_tree_rec: %s\n", current_node->name); + if (current_node) { /* properties */ if (current_node->props) { @@ -122,9 +125,7 @@ static void xml_parser_free_tree_rec(xml_node_t *current_node, int free_next) { /* child nodes */ if (current_node->child) { -#ifdef LOG - printf("xml_parser: xml_parser_free_tree_rec: child\n"); -#endif + lprintf("xml_parser_free_tree_rec: child\n"); xml_parser_free_tree_rec(current_node->child, 1); } @@ -135,9 +136,7 @@ static void xml_parser_free_tree_rec(xml_node_t *current_node, int free_next) { while (next_node) { next_next_node = next_node->next; -#ifdef LOG - printf("xml_parser: xml_parser_free_tree_rec: next\n"); -#endif + lprintf("xml_parser_free_tree_rec: next\n"); xml_parser_free_tree_rec(next_node, 0); next_node = next_next_node; } @@ -148,9 +147,7 @@ static void xml_parser_free_tree_rec(xml_node_t *current_node, int free_next) { } void xml_parser_free_tree(xml_node_t *current_node) { -#ifdef LOG - printf("xml_parser: xml_parser_free_tree\n"); -#endif + lprintf("xml_parser_free_tree\n"); xml_parser_free_tree_rec(current_node, 1); } @@ -175,9 +172,8 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r while ((bypass_get_token) || (res = lexer_get_token(tok, TOKEN_SIZE)) != T_ERROR) { bypass_get_token = 0; -#ifdef LOG - printf("xmlparser: info: %d - %d : '%s'\n", state, res, tok); -#endif + lprintf("info: %d - %d : '%s'\n", state, res, tok); + switch (state) { case STATE_IDLE: switch (res) { @@ -210,9 +206,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r free(current_node->data); } current_node->data = strdup(tok); -#ifdef LOG - printf("xmlparser: info: node data : %s\n", current_node->data); -#endif + lprintf("info: node data : %s\n", current_node->data); break; default: printf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state); @@ -233,9 +227,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r } strcpy(node_name, tok); state = 2; -#ifdef LOG - printf("xmlparser: info: current node name \"%s\"\n", node_name); -#endif + lprintf("info: current node name \"%s\"\n", node_name); break; default: printf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state); @@ -258,9 +250,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r /* set node propertys */ subtree->props = properties; -#ifdef LOG - printf("xmlparser: info: rec %d new subtree %s\n", rec, node_name); -#endif + lprintf("info: rec %d new subtree %s\n", rec, node_name); parse_res = xml_parser_get_node(subtree, node_name, rec + 1); if (parse_res != 0) { return parse_res; @@ -285,9 +275,8 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r /* set node propertys */ subtree->props = properties; -#ifdef LOG - printf("xmlparser: info: rec %d new subtree %s\n", rec, node_name); -#endif + lprintf("info: rec %d new subtree %s\n", rec, node_name); + if (current_subtree == NULL) { current_node->child = subtree; current_subtree = subtree; @@ -304,9 +293,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r } strcpy(property_name, tok); state = 5; -#ifdef LOG - printf("xmlparser: info: current property name \"%s\"\n", property_name); -#endif + lprintf("info: current property name \"%s\"\n", property_name); break; default: printf("xmlparser: error: unexpected token \"%s\", state %d\n", tok, state); @@ -373,9 +360,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r current_property = current_property->next; } current_property->name = strdup (property_name); -#ifdef LOG - printf("xmlparser: info: new property %s\n", current_property->name); -#endif + lprintf("info: new property %s\n", current_property->name); bypass_get_token = 1; /* jump to state 2 without get a new token */ state = 2; break; @@ -405,9 +390,7 @@ static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int r } current_property->name = strdup(property_name); current_property->value = strdup(tok); -#ifdef LOG - printf("xmlparser: info: new property %s=%s\n", current_property->name, current_property->value); -#endif + lprintf("info: new property %s=%s\n", current_property->name, current_property->value); state = 2; break; default: @@ -494,14 +477,10 @@ char *xml_parser_get_property (xml_node_t *node, const char *name) { prop = node->props; while (prop) { -#ifdef LOG - printf ("xmlparser: looking for %s in %s\n", name, prop->name); -#endif + lprintf ("looking for %s in %s\n", name, prop->name); if (!strcasecmp (prop->name, name)) { -#ifdef LOG - printf ("xmlparser: found it. value=%s\n", prop->value); -#endif + lprintf ("found it. value=%s\n", prop->value); return prop->value; } |