[GNUnet-SVN] r28216 - libmicrohttpd/src/examples

[gnunet]

Author: andreyu
Date: 2013-07-20 20:35:59 +0200 (Sat, 20 Jul 2013)
New Revision: 28216

Modified:
   libmicrohttpd/src/examples/mhd2spdy_http.c
   libmicrohttpd/src/examples/mhd2spdy_http.h
   libmicrohttpd/src/examples/mhd2spdy_spdy.c
   libmicrohttpd/src/examples/mhd2spdy_spdy.h
Log:
mhd2spdy: -Wextra warnings fixed

Modified: libmicrohttpd/src/examples/mhd2spdy_http.c
===================================================================
--- libmicrohttpd/src/examples/mhd2spdy_http.c  2013-07-20 17:03:17 UTC (rev 
28215)
+++ libmicrohttpd/src/examples/mhd2spdy_http.c  2013-07-20 18:35:59 UTC (rev 
28216)
@@ -27,6 +27,8 @@
 
 void * http_log_cb(void * cls, const char * uri)
 {
+  (void)cls;
+  
   struct HTTP_URI * http_uri;
   
   PRINT_INFO2("log uri '%s'\n", uri);
@@ -55,6 +57,8 @@
                            enum MHD_ValueKind kind,
                            const char *name, const char *value)
 {
+  (void)kind;
+  
   static char * const forbidden[] = {"Transfer-Encoding",
     "Proxy-Connection",
     "Keep-Alive",
@@ -84,6 +88,8 @@
                                char *buffer,
                                size_t max)
 {
+  (void)pos;
+  
        int ret;
        struct Proxy *proxy = (struct Proxy *)cls;
        void *newbody;
@@ -207,6 +213,11 @@
                 size_t *upload_data_size,
                 void **ptr)
 {
+  (void)cls;
+  (void)url;
+  (void)upload_data;
+  (void)upload_data_size;
+  
   //struct MHD_Response *response;
   int ret;
   struct Proxy *proxy;

Modified: libmicrohttpd/src/examples/mhd2spdy_http.h
===================================================================
--- libmicrohttpd/src/examples/mhd2spdy_http.h  2013-07-20 17:03:17 UTC (rev 
28215)
+++ libmicrohttpd/src/examples/mhd2spdy_http.h  2013-07-20 18:35:59 UTC (rev 
28216)
@@ -25,6 +25,7 @@
 
 #include "mhd2spdy_structures.h"
 
+
 int
 http_cb_request (void *cls,
                 struct MHD_Connection *connection,

Modified: libmicrohttpd/src/examples/mhd2spdy_spdy.c
===================================================================
--- libmicrohttpd/src/examples/mhd2spdy_spdy.c  2013-07-20 17:03:17 UTC (rev 
28215)
+++ libmicrohttpd/src/examples/mhd2spdy_spdy.c  2013-07-20 18:35:59 UTC (rev 
28216)
@@ -70,9 +70,14 @@
  * spdylay_send_callback for the details.
  */
 static ssize_t spdy_cb_send(spdylay_session *session,
-                             const uint8_t *data, size_t length, int flags,
+                             const uint8_t *data,
+                             size_t length,
+                             int flags,
                              void *user_data)
 {
+  (void)session;
+  (void)flags;
+  
   //PRINT_INFO("spdy_cb_send called");
   struct SPDY_Connection *connection;
   ssize_t rv;
@@ -129,6 +134,9 @@
                              uint8_t *buf, size_t length, int flags,
                              void *user_data)
 {
+  (void)session;
+  (void)flags;
+  
   struct SPDY_Connection *connection;
   ssize_t rv;
   
@@ -199,6 +207,8 @@
                                   spdylay_frame_type type,
                                   spdylay_frame *frame, void *user_data)
 {
+  (void)user_data;
+  
   //char **nv;
   //const char *name = NULL;
   int32_t stream_id;
@@ -224,6 +234,8 @@
                                   spdylay_frame_type type,
                                   spdylay_frame *frame, void *user_data)
 {
+  (void)user_data;
+  
   //struct SPDY_Request *req;
   char **nv;
   //const char *name = NULL;
@@ -284,6 +296,9 @@
                                      spdylay_status_code status_code,
                                      void *user_data)
 {
+  (void)status_code;
+  (void)user_data;
+  
   struct Proxy * proxy = spdylay_session_get_stream_user_data(session, 
stream_id);
   
   assert(NULL != proxy);
@@ -312,6 +327,9 @@
                                         const uint8_t *data, size_t len,
                                         void *user_data)
 {
+  (void)flags;
+  (void)user_data;
+  
   //struct SPDY_Request *req;
   struct Proxy *proxy;
   proxy = spdylay_session_get_stream_user_data(session, stream_id);
@@ -335,6 +353,9 @@
 static void spdy_cb_on_data_recv(spdylay_session *session,
                uint8_t flags, int32_t stream_id, int32_t length, void 
*user_data)
 {
+  (void)length;
+  (void)user_data;
+  
        if(flags & SPDYLAY_DATA_FLAG_FIN)
        {
     struct Proxy *proxy;
@@ -373,6 +394,8 @@
                                 const unsigned char *in, unsigned int inlen,
                                 void *arg)
 {
+  (void)ssl;
+  
     //PRINT_INFO("spdy_cb_ssl_select_next_proto");
   int rv;
   uint16_t *spdy_proto_version;
@@ -505,6 +528,8 @@
                                fd_set * except_fd_set,
          struct SPDY_Connection *connection)
 {
+  (void)except_fd_set;
+  
   bool ret = false;
   
   if(spdylay_session_want_read(connection->session) ||
@@ -687,7 +712,7 @@
 
 
 void
-spdy_get_pollfdset(struct pollfd fds[], struct SPDY_Connection *connections[], 
int max_size, nfds_t *real_size)
+spdy_get_pollfdset(struct pollfd fds[], struct SPDY_Connection *connections[], 
unsigned int max_size, nfds_t *real_size)
 {
   struct SPDY_Connection *connection;
   struct Proxy *proxy;
@@ -756,7 +781,7 @@
 spdy_get_selectfdset(fd_set * read_fd_set,
                                fd_set * write_fd_set, 
                                fd_set * except_fd_set,
-        struct SPDY_Connection *connections[], int max_size, nfds_t *real_size)
+        struct SPDY_Connection *connections[], unsigned int max_size, nfds_t 
*real_size)
 {
   struct SPDY_Connection *connection;
   struct Proxy *proxy;

Modified: libmicrohttpd/src/examples/mhd2spdy_spdy.h
===================================================================
--- libmicrohttpd/src/examples/mhd2spdy_spdy.h  2013-07-20 17:03:17 UTC (rev 
28215)
+++ libmicrohttpd/src/examples/mhd2spdy_spdy.h  2013-07-20 18:35:59 UTC (rev 
28216)
@@ -47,14 +47,14 @@
 spdy_free_connection(struct SPDY_Connection * connection);
 
 void
-spdy_get_pollfdset(struct pollfd fds[], struct SPDY_Connection *connections[], 
int max_size, nfds_t *real_size);
+spdy_get_pollfdset(struct pollfd fds[], struct SPDY_Connection *connections[], 
unsigned int max_size, nfds_t *real_size);
 
 
 int
 spdy_get_selectfdset(fd_set * read_fd_set,
                                fd_set * write_fd_set, 
                                fd_set * except_fd_set,
-        struct SPDY_Connection *connections[], int max_size, nfds_t 
*real_size);
+        struct SPDY_Connection *connections[], unsigned int max_size, nfds_t 
*real_size);
         
 void
 spdy_run(struct pollfd fds[], struct SPDY_Connection *connections[], int size);