[rtmpdump] r249 - in trunk: hashswf.c http.h rtmp.c

[hyc]

Author: hyc
Date: Thu Feb 11 23:34:13 2010
New Revision: 249

Log:
Cleanup prev commits

Modified:
   trunk/hashswf.c
   trunk/http.h
   trunk/rtmp.c

Modified: trunk/hashswf.c
==============================================================================
--- trunk/hashswf.c	Thu Feb 11 23:30:18 2010	(r248)
+++ trunk/hashswf.c	Thu Feb 11 23:34:13 2010	(r249)
@@ -88,7 +88,7 @@ swfcrunch(void *ptr, size_t size, size_t
 #define	AGENT	"Mozilla/5.0"
 
 HTTPResult
-http_get(struct http_ctx *http, const char *url, http_read_callback cb)
+HTTP_get(struct HTTP_ctx *http, const char *url, HTTP_read_callback *cb)
 {
   char *host, *path;
   char *p1, *p2;
@@ -355,7 +355,7 @@ RTMP_HashSWF(const char *url, unsigned i
   int i, got = 0, ret = 0;
   unsigned int hlen;
   struct info in = {0};
-  struct http_ctx http = {0};
+  struct HTTP_ctx http = {0};
   HTTPResult httpres;
   z_stream zs = {0};
   HMAC_CTX ctx;
@@ -470,7 +470,7 @@ RTMP_HashSWF(const char *url, unsigned i
   http.date = date;
   http.data = ∈
 
-  httpres = http_get(&http, url, swfcrunch);
+  httpres = HTTP_get(&http, url, swfcrunch);
 
   inflateEnd(&zs);
 

Modified: trunk/http.h
==============================================================================
--- trunk/http.h	Thu Feb 11 23:30:18 2010	(r248)
+++ trunk/http.h	Thu Feb 11 23:34:13 2010	(r249)
@@ -1,10 +1,7 @@
 #ifndef __HTTP_H__
 #define __HTTP_H__
 /*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *      Copyright (C) 2008-2009 Andrej Stepanchuk
- *      Copyright (C) 2009-2010 Howard Chu
+ *      Copyright (C) 2010 Howard Chu
  *      Copyright (C) 2010 Antti Ajanki
  *
  *  This Program is free software; you can redistribute it and/or modify
@@ -34,15 +31,15 @@ typedef enum {
   HTTPRES_LOST_CONNECTION,  /* connection lost while waiting for data */
 } HTTPResult;
 
-struct http_ctx {
+struct HTTP_ctx {
   char *date;
   int size;
   int status;
   void *data;
 };
 
-typedef size_t (*http_read_callback)(void *ptr, size_t size, size_t nmemb, void *stream);
+typedef size_t (HTTP_read_callback)(void *ptr, size_t size, size_t nmemb, void *stream);
 
-HTTPResult http_get(struct http_ctx *http, const char *url, http_read_callback cb);
+HTTPResult HTTP_get(struct HTTP_ctx *http, const char *url, HTTP_read_callback *cb);
 
 #endif

Modified: trunk/rtmp.c
==============================================================================
--- trunk/rtmp.c	Thu Feb 11 23:30:18 2010	(r248)
+++ trunk/rtmp.c	Thu Feb 11 23:34:13 2010	(r249)
@@ -494,7 +494,7 @@ RTMP_ConnectStream(RTMP * r, double seek
 	      (packet.m_packetType == RTMP_PACKET_TYPE_INFO))
 	    {
 	      Log(LOGWARNING, "Received FLV packet before play()! Ignoring.");
-	        RTMPPacket_Free(&packet);
+	      RTMPPacket_Free(&packet);
 	      continue;
 	    }