]> granicus.if.org Git - rtmpdump/commitdiff
Cleanup prev commit
authorhyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Tue, 29 Jun 2010 01:39:49 +0000 (01:39 +0000)
committerhyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Tue, 29 Jun 2010 01:39:49 +0000 (01:39 +0000)
git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@522 400ebc74-4327-4243-bc38-086b20814532

librtmp/rtmp.c

index 29da0934b0a9673f70403d3d0bf22191b85da87d..3f662bcf98d2e028e8f033c28884069a702fea1f 100644 (file)
@@ -714,28 +714,26 @@ int RTMP_SetupURL(RTMP *r, char *url)
 
   if (!r->Link.tcUrl.av_len)
     {
-         r->Link.tcUrl.av_val = url;
-         if (r->Link.app.av_len) {
-           if (r->Link.app.av_val < url + len)
-                 {
-                   /* if app is part of original url, just use it */
-               r->Link.tcUrl.av_len = r->Link.app.av_len + (r->Link.app.av_val - url);
-                 }
-               else
-                 {
-                   len = r->Link.hostname.av_len + r->Link.app.av_len +
-                         sizeof("rtmpte://65535/");
-                       r->Link.tcUrl.av_val = malloc(len);
-                       r->Link.tcUrl.av_len = snprintf(r->Link.tcUrl.av_val, len,
-                         "%s://%.*s:%d/%.*s",
-                     RTMPProtocolStringsLower[r->Link.protocol],
-                         r->Link.hostname.av_len, r->Link.hostname.av_val,
-                         r->Link.port,
-                         r->Link.app.av_len, r->Link.app.av_val);
-                       r->Link.lFlags |= RTMP_LF_FTCU;
-                 }
-         } else {
-           r->Link.tcUrl.av_len = strlen(url);
+      r->Link.tcUrl.av_val = url;
+      if (r->Link.app.av_len) {
+        if (r->Link.app.av_val < url + len)
+         {
+           /* if app is part of original url, just use it */
+            r->Link.tcUrl.av_len = r->Link.app.av_len + (r->Link.app.av_val - url);
+         }
+       else
+         {
+           len = r->Link.hostname.av_len + r->Link.app.av_len +
+                 sizeof("rtmpte://:65535/");
+           r->Link.tcUrl.av_val = malloc(len);
+           r->Link.tcUrl.av_len = snprintf(r->Link.tcUrl.av_val, len,
+               "%s://%.*s:%d/%.*s",
+               RTMPProtocolStringsLower[r->Link.protocol],
+               r->Link.hostname.av_len, r->Link.hostname.av_val,
+               r->Link.port,
+               r->Link.app.av_len, r->Link.app.av_val);
+           r->Link.lFlags |= RTMP_LF_FTCU;
+           tcUrl.av_len = strlen(url);
          }
        }
 
@@ -3449,10 +3447,10 @@ RTMP_Close(RTMP *r)
 
   if (r->Link.lFlags & RTMP_LF_FTCU)
     {
-         free(r->Link.tcUrl.av_val);
-         r->Link.tcUrl.av_val = NULL;
-         r->Link.lFlags ^= RTMP_LF_FTCU;
-       }
+      free(r->Link.tcUrl.av_val);
+      r->Link.tcUrl.av_val = NULL;
+      r->Link.lFlags ^= RTMP_LF_FTCU;
+    }
 
 #ifdef CRYPTO
   if (r->Link.dh)