Mercurial > mplayer.hg

diff stream/librtsp/rtsp.c @ 32537:8fa2f43cb760

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/stream/librtsp/rtsp.c	Sat Nov 13 10:23:34 2010 +0000
+++ b/stream/librtsp/rtsp.c	Sun Nov 14 09:12:34 2010 +0000
@@ -291,7 +291,7 @@
     if (!strncasecmp(answer,"Server:",7)) {
       char *buf = malloc(strlen(answer));
       sscanf(answer,"%*s %s",buf);
-      if (s->server) free(s->server);
+      free(s->server);
       s->server=strdup(buf);
       free(buf);
     }
@@ -612,7 +612,7 @@
 
 void rtsp_set_session(rtsp_t *s, const char *id) {
 
-  if (s->session) free(s->session);
+  free(s->session);
 
   s->session=strdup(id);
 
@@ -686,7 +686,7 @@
     else
       ptr++;
   }
-  if (*ptr) free(*ptr);
+  free(*ptr);
   ptr++;
   do {
     *(ptr-1)=*ptr;