diff options
author | Julien Chaffraix <julien.chaffraix@gmail.com> | 2010-05-25 06:43:41 -0700 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2010-05-26 00:41:45 +0200 |
commit | d3c813e7266f4761e15ad3e73f2c66eff9a742f9 (patch) | |
tree | ef4505f6ee5d7216da3de8180d7c0c907aace519 | |
parent | 9e480973eb6175bcf7ddacb5c0356e3c16373253 (diff) |
RTMP: Fix compiler warnings
-rw-r--r-- | CHANGES | 3 | ||||
-rw-r--r-- | lib/curl_rtmp.c | 12 |
2 files changed, 14 insertions, 1 deletions
@@ -6,6 +6,9 @@ Changelog +- Julien Chaffraix fixed the warning seen when compiling lib/rtmp.c: one + unused variables, several unused arguments and some missing #include. + - Julien Chaffraix fixed 2 OOM errors: a missing NULL-check in lib/http_negociate.c and a potential NULL dereferencing in lib/splay.c diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c index 4700719ba..21a67f5ce 100644 --- a/lib/curl_rtmp.c +++ b/lib/curl_rtmp.c @@ -25,6 +25,9 @@ #ifdef USE_LIBRTMP #include "urldata.h" +#include "nonblock.h" /* for curlx_nonblock */ +#include "progress.h" /* for Curl_pgrsSetUploadSize */ +#include "transfer.h" #include <curl/curl.h> #include <librtmp/rtmp.h> @@ -153,7 +156,6 @@ const struct Curl_handler Curl_handler_rtmpts = { static CURLcode rtmp_setup(struct connectdata *conn) { - int rc; RTMP *r = RTMP_Alloc(); if (!r) @@ -220,6 +222,10 @@ static CURLcode rtmp_do(struct connectdata *conn, bool *done) static CURLcode rtmp_done(struct connectdata *conn, CURLcode status, bool premature) { + (void)conn; /* unused */ + (void)status; /* unused */ + (void)premature; /* unused */ + return CURLE_OK; } @@ -240,6 +246,8 @@ static ssize_t rtmp_recv(struct connectdata *conn, int sockindex, char *buf, RTMP *r = conn->proto.generic; ssize_t nread; + (void)sockindex; /* unused */ + nread = RTMP_Read(r, buf, len); if (nread < 0) { if (r->m_read.status == RTMP_READ_COMPLETE || @@ -258,6 +266,8 @@ static ssize_t rtmp_send(struct connectdata *conn, int sockindex, RTMP *r = conn->proto.generic; ssize_t num; + (void)sockindex; /* unused */ + num = RTMP_Write(r, (char *)buf, len); if (num < 0) { *err = CURLE_SEND_ERROR; |