Mercurial > mplayer.hg
comparison stream/librtsp/rtsp.c @ 32537:8fa2f43cb760
Remove most of the NULL pointer check before free all over the code
author | cboesch |
---|---|
date | Sun, 14 Nov 2010 09:12:34 +0000 |
parents | b01f807eb183 |
children | 389d43c448b3 |
comparison
equal
deleted
inserted
replaced
32536:187f26cba0ce | 32537:8fa2f43cb760 |
---|---|
289 } | 289 } |
290 } | 290 } |
291 if (!strncasecmp(answer,"Server:",7)) { | 291 if (!strncasecmp(answer,"Server:",7)) { |
292 char *buf = malloc(strlen(answer)); | 292 char *buf = malloc(strlen(answer)); |
293 sscanf(answer,"%*s %s",buf); | 293 sscanf(answer,"%*s %s",buf); |
294 if (s->server) free(s->server); | 294 free(s->server); |
295 s->server=strdup(buf); | 295 s->server=strdup(buf); |
296 free(buf); | 296 free(buf); |
297 } | 297 } |
298 if (!strncasecmp(answer,"Session:",8)) { | 298 if (!strncasecmp(answer,"Session:",8)) { |
299 char *buf = calloc(1, strlen(answer)); | 299 char *buf = calloc(1, strlen(answer)); |
610 * session id management | 610 * session id management |
611 */ | 611 */ |
612 | 612 |
613 void rtsp_set_session(rtsp_t *s, const char *id) { | 613 void rtsp_set_session(rtsp_t *s, const char *id) { |
614 | 614 |
615 if (s->session) free(s->session); | 615 free(s->session); |
616 | 616 |
617 s->session=strdup(id); | 617 s->session=strdup(id); |
618 | 618 |
619 } | 619 } |
620 | 620 |
684 if (!strncmp(*ptr, string, strlen(string))) | 684 if (!strncmp(*ptr, string, strlen(string))) |
685 break; | 685 break; |
686 else | 686 else |
687 ptr++; | 687 ptr++; |
688 } | 688 } |
689 if (*ptr) free(*ptr); | 689 free(*ptr); |
690 ptr++; | 690 ptr++; |
691 do { | 691 do { |
692 *(ptr-1)=*ptr; | 692 *(ptr-1)=*ptr; |
693 } while(*ptr); | 693 } while(*ptr); |
694 } | 694 } |