Changeset 1027:0117a7746b21 in freeDiameter for libfdcore/sctps.c

Timestamp:

Apr 15, 2013, 4:17:07 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Fix a number of errors and warnings introduced/highlighted by recent commits

File:

• libfdcore/sctps.c (modified) (4 diffs)

libfdcore/sctps.c

@@ -95 +95 @@
                                         CHECK_FCT_DO(fd_event_send(conn->cc_sctps_data.array[strid].raw_recv, event, bufsz, buf), goto fatal );
                                 } else {
-                                        TRACE_DEBUG(INFO, "Received packet (%d bytes) on out-of-range stream #%d from %s, discarded.", bufsz, strid, conn->cc_remid);
+                                        TRACE_DEBUG(INFO, "Received packet (%zd bytes) on out-of-range stream #%d from %s, discarded.", bufsz, strid, conn->cc_remid);
                                         free(buf);
                                 }
@@ -230 +230 @@
 
 /* Set the parameters of a session to use the appropriate fifo and stream information */
+#ifndef GNUTLS_VERSION_300
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif /* !GNUTLS_VERSION_300 */
 static void set_sess_transport(gnutls_session_t session, struct sctps_ctx *ctx)
 {
@@ -238 +241 @@
 #ifndef GNUTLS_VERSION_300
         /* starting version 2.12, this call is not needed */
-        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         GNUTLS_TRACE( gnutls_transport_set_lowat( session, 0 ) );
-        #pragma GCC diagnostic warning "-Wdeprecated-declarations"
 #endif /* GNUTLS_VERSION_300 */
         
@@ -249 +250 @@
         return;
 }
+#ifndef GNUTLS_VERSION_300
+# pragma GCC diagnostic pop "-Wdeprecated-declarations"
+#endif /* !GNUTLS_VERSION_300 */
 
 /*************************************************************/