Changeset 1027:0117a7746b21 in freeDiameter for libfdcore/config.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/config.c (modified) (3 diffs)

libfdcore/config.c

@@ -226 +226 @@
 #endif /* GNUTLS_VERSION_300 */
 
+#ifndef GNUTLS_VERSION_300
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif /* !GNUTLS_VERSION_300 */
 /* Parse the configuration file (using the yacc parser) */
 int fd_conf_parse()
@@ -474 +477 @@
                         unsigned int verify;
                         time_t now;
-                        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
                         GNUTLS_TRACE( gnutls_certificate_get_x509_cas (fd_g_config->cnf_sec_data.credentials, &CA_list, (unsigned int *) &CA_list_length) );
                         GNUTLS_TRACE( gnutls_certificate_get_x509_crls (fd_g_config->cnf_sec_data.credentials, &CRL_list, (unsigned int *) &CRL_list_length) );
-                        #pragma GCC diagnostic warning "-Wdeprecated-declarations"
                         CHECK_GNUTLS_DO( gnutls_x509_crt_list_verify(certs, cert_max, CA_list, CA_list_length, CRL_list, CRL_list_length, 0, &verify),
                                 {
@@ -597 +598 @@
         return 0;
 }
+#ifndef GNUTLS_VERSION_300
+# pragma GCC diagnostic pop "-Wdeprecated-declarations"
+#endif /* !GNUTLS_VERSION_300 */