summaryrefslogtreecommitdiffstats
path: root/stream/librtsp/rtsp.c
diff options
context:
space:
mode:
authorcboesch <cboesch@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-11-14 09:12:34 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-14 13:11:20 +0200
commitfe3c4810e1c8b535caf07df8e4434e322d3e6fc0 (patch)
treecbcd859f358c479223eb7b0aa2a2d3dfe1c81b69 /stream/librtsp/rtsp.c
parentb492561241f2a3263a8ab558fafc957130dbdfc1 (diff)
downloadmpv-fe3c4810e1c8b535caf07df8e4434e322d3e6fc0.tar.bz2
mpv-fe3c4810e1c8b535caf07df8e4434e322d3e6fc0.tar.xz
cleanup: remove NULL checks before free() all over the code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/librtsp/rtsp.c')
-rw-r--r--stream/librtsp/rtsp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/stream/librtsp/rtsp.c b/stream/librtsp/rtsp.c
index 82669616ac..e02ae4c72b 100644
--- a/stream/librtsp/rtsp.c
+++ b/stream/librtsp/rtsp.c
@@ -291,7 +291,7 @@ static int rtsp_get_answers(rtsp_t *s) {
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 @@ char *rtsp_search_answers(rtsp_t *s, const char *tag) {
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 @@ void rtsp_unschedule_field(rtsp_t *s, const char *string) {
else
ptr++;
}
- if (*ptr) free(*ptr);
+ free(*ptr);
ptr++;
do {
*(ptr-1)=*ptr;