From 6e9cbdc10448203e7c8b2de41447442fcc9f7bae Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 13 May 2009 02:58:57 +0000 Subject: whitespace cosmetics: Remove all trailing whitespace. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2 --- asxparser.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'asxparser.c') diff --git a/asxparser.c b/asxparser.c index cf72875886..9d4d36c3c6 100644 --- a/asxparser.c +++ b/asxparser.c @@ -49,7 +49,7 @@ asx_list_remove(void* list_ptr,void* entry,ASX_FreeFunc free_func) { if(e == -1) return; // Not found if(free_func != NULL) free_func(list[e]); - + if(c == 1) { // Only one entry, we drop all free(list); *(void**)list_ptr = NULL; @@ -61,7 +61,7 @@ asx_list_remove(void* list_ptr,void* entry,ASX_FreeFunc free_func) { list = (void*)realloc(list,(c-1)*sizeof(void*)); list[c-1] = NULL; - + *(void***)list_ptr = list; } @@ -167,22 +167,22 @@ asx_parse_attribs(ASX_Parser_t* parser,char* buffer,char*** _attribs) { strncpy(val,ptr1,ptr2-ptr1); val[ptr2-ptr1] = '\0'; n_attrib++; - + attribs = (char**)realloc(attribs,(2*n_attrib+1)*sizeof(char*)); attribs[n_attrib*2-2] = attrib; attribs[n_attrib*2-1] = val; - + ptr1 = ptr2+1; } - + if(n_attrib > 0) attribs[n_attrib*2] = NULL; *_attribs = attribs; - + return n_attrib; } - + /* * Return -1 on error, 0 when nothing is found, 1 on sucess */ @@ -215,11 +215,11 @@ asx_get_element(ASX_Parser_t* parser,char** _buffer, parser->line = ls[i].line; break; } - + } if( i < parser->ret_stack_size) { i++; - if( i < parser->ret_stack_size) + if( i < parser->ret_stack_size) memmove(parser->ret_stack,parser->ret_stack+i, (parser->ret_stack_size - i)*sizeof(ASX_LineSave_t)); parser->ret_stack_size -= i; if(parser->ret_stack_size > 0) @@ -242,7 +242,7 @@ asx_get_element(ASX_Parser_t* parser,char** _buffer, } //ptr1 = strchr(ptr1,'<'); if(!ptr1 || ptr1[1] == '\0') return 0; // Nothing found - + if(strncmp(ptr1,"",3) != 0 ; ptr1++) { if(ptr1[0] == '\0') { @@ -260,7 +260,7 @@ asx_get_element(ASX_Parser_t* parser,char** _buffer, break; } } - + // Is this space skip very useful ?? for(ptr1++; strchr(SPACE,ptr1[0]) != NULL; ptr1++) { // Skip space if(ptr1[0] == '\0') { @@ -268,7 +268,7 @@ asx_get_element(ASX_Parser_t* parser,char** _buffer, return -1; } if(ptr1[0] == '\n') parser->line++; - } + } for(ptr2 = ptr1; strchr(LETTER,*ptr2) != NULL;ptr2++) { // Go to end of name if(*ptr2 == '\0'){ @@ -292,10 +292,10 @@ asx_get_element(ASX_Parser_t* parser,char** _buffer, } attrib_line = parser->line; - + for(ptr3 = ptr2; ptr3[0] != '\0'; ptr3++) { // Go to element end - if(ptr3[0] == '"') quotes ^= 1; + if(ptr3[0] == '"') quotes ^= 1; if(!quotes && (ptr3[0] == '>' || strncmp(ptr3,"/>",2) == 0)) break; if(ptr3[0] == '\n') parser->line++; @@ -344,7 +344,7 @@ asx_get_element(ASX_Parser_t* parser,char** _buffer, } continue; } - if(ptr4 == NULL || ptr4[1] == '\0') { + if(ptr4 == NULL || ptr4[1] == '\0') { mp_msg(MSGT_PLAYTREE,MSGL_ERR,"At line %d : EOB reached while parsing %s element body",parser->line,element); free(element); if(attribs) free(attribs); @@ -369,7 +369,7 @@ asx_get_element(ASX_Parser_t* parser,char** _buffer, ptr4++; body = malloc(ptr4-ptr3+1); strncpy(body,ptr3,ptr4-ptr3); - body[ptr4-ptr3] = '\0'; + body[ptr4-ptr3] = '\0'; } break; } else { @@ -419,7 +419,7 @@ asx_get_element(ASX_Parser_t* parser,char** _buffer, static void asx_parse_param(ASX_Parser_t* parser, char** attribs, play_tree_t* pt) { char *name,*val; - + name = asx_get_attrib("NAME",attribs); if(!name) { asx_warning_attrib_required(parser,"PARAM" ,"NAME" ); @@ -502,7 +502,7 @@ asx_parse_entryref(ASX_Parser_t* parser,char* buffer,char** _attribs) { free_stream(stream); free(href); //mp_msg(MSGT_PLAYTREE,MSGL_INFO,"Need to implement entryref\n"); - + return pt; } @@ -539,7 +539,7 @@ asx_parse_entry(ASX_Parser_t* parser,char* buffer,char** _attribs) { return ref; } - + static play_tree_t* asx_parse_repeat(ASX_Parser_t* parser,char* buffer,char** _attribs) { @@ -690,7 +690,7 @@ asx_parser_build_tree(char* buffer,int deep) { if(!list) { play_tree_free(asx,1); - + return NULL; } -- cgit v1.2.3