Mercurial > mplayer.hg

comparison playtree.c @ 23614:bab9e6c606cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cast sizeof() to int in mp_msg arguments so it fits the format string on 64bit
author reimar
date Sun, 24 Jun 2007 10:39:04 +0000
parents f877f8c4ff42
children 4d936284a5ec
comparison
equal deleted inserted replaced
23613:990bafe740df 23614:bab9e6c606cc
20 20
21 play_tree_t* 21 play_tree_t*
22 play_tree_new(void) { 22 play_tree_new(void) {
23 play_tree_t* r = calloc(1,sizeof(play_tree_t)); 23 play_tree_t* r = calloc(1,sizeof(play_tree_t));
24 if(r == NULL) 24 if(r == NULL)
25 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate %d bytes of memory\n",sizeof(play_tree_t)); 25 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate %d bytes of memory\n",(int)sizeof(play_tree_t));
26 r->entry_type = PLAY_TREE_ENTRY_NODE; 26 r->entry_type = PLAY_TREE_ENTRY_NODE;
27 return r; 27 return r;
28 } 28 }
29 29
30 void 30 void
264 for(n = 0 ; pt->files[n] != NULL ; n++) 264 for(n = 0 ; pt->files[n] != NULL ; n++)
265 /* NOTHING */; 265 /* NOTHING */;
266 } 266 }
267 pt->files = (char**)realloc(pt->files,(n+2)*sizeof(char*)); 267 pt->files = (char**)realloc(pt->files,(n+2)*sizeof(char*));
268 if(pt->files ==NULL) { 268 if(pt->files ==NULL) {
269 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate %d bytes of memory\n",(n+2)*sizeof(char*)); 269 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate %d bytes of memory\n",(n+2)*(int)sizeof(char*));
270 return; 270 return;
271 } 271 }
272 272
273 e = pt->files[n] = strdup(file); 273 e = pt->files[n] = strdup(file);
274 pt->files[n+1] = NULL; 274 pt->files[n+1] = NULL;
303 303
304 if(n > 1) { 304 if(n > 1) {
305 memmove(&pt->files[f],&pt->files[f+1],(n-f)*sizeof(char*)); 305 memmove(&pt->files[f],&pt->files[f+1],(n-f)*sizeof(char*));
306 pt->files = (char**)realloc(pt->files,n*sizeof(char*)); 306 pt->files = (char**)realloc(pt->files,n*sizeof(char*));
307 if(pt->files == NULL) { 307 if(pt->files == NULL) {
308 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate %d bytes of memory\n",(n+2)*sizeof(char*)); 308 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate %d bytes of memory\n",(n+2)*(int)sizeof(char*));
309 return -1; 309 return -1;
310 } 310 }
311 } else { 311 } else {
312 free(pt->files); 312 free(pt->files);
313 pt->files = NULL; 313 pt->files = NULL;
338 return; 338 return;
339 } 339 }
340 340
341 pt->params = (play_tree_param_t*)realloc(pt->params,(n+2)*sizeof(play_tree_param_t)); 341 pt->params = (play_tree_param_t*)realloc(pt->params,(n+2)*sizeof(play_tree_param_t));
342 if(pt->params == NULL) { 342 if(pt->params == NULL) {
343 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't realloc params (%d bytes of memory)\n",(n+2)*sizeof(play_tree_param_t)); 343 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't realloc params (%d bytes of memory)\n",(n+2)*(int)sizeof(play_tree_param_t));
344 return; 344 return;
345 } 345 }
346 pt->params[n].name = strdup(name); 346 pt->params[n].name = strdup(name);
347 pt->params[n].value = val != NULL ? strdup(val) : NULL; 347 pt->params[n].value = val != NULL ? strdup(val) : NULL;
348 memset(&pt->params[n+1],0,sizeof(play_tree_param_t)); 348 memset(&pt->params[n+1],0,sizeof(play_tree_param_t));
373 373
374 if(n > 1) { 374 if(n > 1) {
375 memmove(&pt->params[ni],&pt->params[ni+1],(n-ni)*sizeof(play_tree_param_t)); 375 memmove(&pt->params[ni],&pt->params[ni+1],(n-ni)*sizeof(play_tree_param_t));
376 pt->params = (play_tree_param_t*)realloc(pt->params,n*sizeof(play_tree_param_t)); 376 pt->params = (play_tree_param_t*)realloc(pt->params,n*sizeof(play_tree_param_t));
377 if(pt->params == NULL) { 377 if(pt->params == NULL) {
378 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate %d bytes of memory\n",n*sizeof(play_tree_param_t)); 378 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate %d bytes of memory\n",n*(int)sizeof(play_tree_param_t));
379 return -1; 379 return -1;
380 } 380 }
381 } else { 381 } else {
382 free(pt->params); 382 free(pt->params);
383 pt->params = NULL; 383 pt->params = NULL;
480 if( ! play_tree_is_valid(pt)) 480 if( ! play_tree_is_valid(pt))
481 return NULL; 481 return NULL;
482 482
483 iter = calloc(1,sizeof(play_tree_iter_t)); 483 iter = calloc(1,sizeof(play_tree_iter_t));
484 if(! iter) { 484 if(! iter) {
485 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate new iterator (%d bytes of memory)\n",sizeof(play_tree_iter_t)); 485 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate new iterator (%d bytes of memory)\n",(int)sizeof(play_tree_iter_t));
486 return NULL; 486 return NULL;
487 } 487 }
488 iter->root = pt; 488 iter->root = pt;
489 iter->tree = NULL; 489 iter->tree = NULL;
490 iter->config = config; 490 iter->config = config;
702 else { 702 else {
703 free(iter->status_stack); 703 free(iter->status_stack);
704 iter->status_stack = NULL; 704 iter->status_stack = NULL;
705 } 705 }
706 if(iter->stack_size > 0 && iter->status_stack == NULL) { 706 if(iter->stack_size > 0 && iter->status_stack == NULL) {
707 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate %d bytes of memory\n",iter->stack_size*sizeof(char*)); 707 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate %d bytes of memory\n",iter->stack_size*(int)sizeof(char*));
708 return PLAY_TREE_ITER_ERROR; 708 return PLAY_TREE_ITER_ERROR;
709 } 709 }
710 iter->tree = iter->tree->parent; 710 iter->tree = iter->tree->parent;
711 711
712 // Pop subtree params 712 // Pop subtree params
736 play_tree_iter_push_params(iter); 736 play_tree_iter_push_params(iter);
737 737
738 iter->stack_size++; 738 iter->stack_size++;
739 iter->status_stack = (int*)realloc(iter->status_stack,iter->stack_size*sizeof(int)); 739 iter->status_stack = (int*)realloc(iter->status_stack,iter->stack_size*sizeof(int));
740 if(iter->status_stack == NULL) { 740 if(iter->status_stack == NULL) {
741 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate %d bytes of memory\n",iter->stack_size*sizeof(int)); 741 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate %d bytes of memory\n",iter->stack_size*(int)sizeof(int));
742 return PLAY_TREE_ITER_ERROR; 742 return PLAY_TREE_ITER_ERROR;
743 } 743 }
744 iter->status_stack[iter->stack_size-1] = iter->loop; 744 iter->status_stack[iter->stack_size-1] = iter->loop;
745 // Set new status 745 // Set new status
746 iter->loop = iter->tree->loop-1; 746 iter->loop = iter->tree->loop-1;
829 assert(old != NULL); 829 assert(old != NULL);
830 #endif 830 #endif
831 831
832 iter = malloc(sizeof(play_tree_iter_t)); 832 iter = malloc(sizeof(play_tree_iter_t));
833 if(iter == NULL) { 833 if(iter == NULL) {
834 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate %d bytes of memory\n",sizeof(play_tree_iter_t)); 834 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate %d bytes of memory\n",(int)sizeof(play_tree_iter_t));
835 return NULL; 835 return NULL;
836 } 836 }
837 ; 837 ;
838 memcpy(iter,old,sizeof(play_tree_iter_t)); 838 memcpy(iter,old,sizeof(play_tree_iter_t));
839 if(old->status_stack) { 839 if(old->status_stack) {
840 iter->status_stack = malloc(old->stack_size * sizeof(int)); 840 iter->status_stack = malloc(old->stack_size * sizeof(int));
841 if(iter->status_stack == NULL) { 841 if(iter->status_stack == NULL) {
842 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate %d bytes of memory\n",old->stack_size * sizeof(int)); 842 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate %d bytes of memory\n",old->stack_size * (int)sizeof(int));
843 free(iter); 843 free(iter);
844 return NULL; 844 return NULL;
845 } 845 }
846 memcpy(iter->status_stack,old->status_stack,iter->stack_size*sizeof(int)); 846 memcpy(iter->status_stack,old->status_stack,iter->stack_size*sizeof(int));
847 } 847 }