From: Willem Toorop <willem@NLnetLabs.nl>
Date: Mon, 19 Sep 2011 21:28:39 +0000 (+0000)
Subject: Suppress warnings from automatically generated code by SWIG.
X-Git-Tag: release-1.6.11rc1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a36e2a10f54fd237c955480e5d014ab3d774492;p=thirdparty%2Fldns.git

Suppress warnings from automatically generated code by SWIG.
Reformat some of the comments to prevent "warning: marco .... not defined" messages
Adapted configure.ac to nu use PYTHON_VERSION directly (as advised in the ax_python_devel package).
---

diff --git a/configure.ac b/configure.ac
index e259e069..0d0b3a25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,15 +93,8 @@ if test x_$withval != x_no; then
    sinclude(ax_python_devel.m4)
    ac_save_LIBS="$LIBS" dnl otherwise AC_PYTHON_DEVEL thrashes $LIBS
 
-   AX_PYTHON_DEVEL
-   if test ! -z "$PYTHON_VERSION"; then
-        if test `$PYTHON -c "import sys; \
-            ver = sys.version.split()[[0]]; \
-            print(ver >= '2.4.0')"` = "False"; then
-                AC_MSG_ERROR([Python version >= 2.4.0 is required])
-        fi
-	# Have Python
-	AC_DEFINE(HAVE_PYTHON,1,[Define if you have Python libraries and header files.])
+   AX_PYTHON_DEVEL([>= '2.4.0'])
+   if test ! -z "$ac_python_version"; then
 	ldns_have_python=yes
    fi
 
@@ -139,6 +132,9 @@ if test x_$withval != x_no; then
    # xtra cflags for pyldns
    if test x_$ldns_have_python != x_no; then
 	ACX_CHECK_COMPILER_FLAG(fno-strict-aliasing, [PYTHON_X_CFLAGS="-fno-strict-aliasing"])
+	ACX_CHECK_COMPILER_FLAG(Wno-missing-field-initializers, [PYTHON_X_CFLAGS="-Wno-missing-field-initializers $PYTHON_X_CFLAGS"])
+	ACX_CHECK_COMPILER_FLAG(Wno-unused-parameter, [PYTHON_X_CFLAGS="-Wno-unused-parameter $PYTHON_X_CFLAGS"])
+	ACX_CHECK_COMPILER_FLAG(Wno-unused-variable, [PYTHON_X_CFLAGS="-Wno-unused-variable $PYTHON_X_CFLAGS"])
    fi
 fi
 AC_SUBST(PYTHON_X_CFLAGS)
diff --git a/ldns/buffer.h b/ldns/buffer.h
index 65b8bdc4..03df14c9 100644
--- a/ldns/buffer.h
+++ b/ldns/buffer.h
@@ -607,8 +607,8 @@ ldns_buffer_status_ok(ldns_buffer *buffer)
 
 /**
  * prints to the buffer, increasing the capacity if required using
- * buffer_reserve(). The buffer's position is set to the terminating
- * '\\0'. Returns the number of characters written (not including the
+ * buffer_reserve(). The buffer's position is set to the terminating '\\0'
+ * Returns the number of characters written (not including the
  * terminating '\\0') or -1 on failure.
  */
 int ldns_buffer_printf(ldns_buffer *buffer, const char *format, ...);
diff --git a/ldns/dnssec_verify.h b/ldns/dnssec_verify.h
index cfed9e60..13b3fa32 100644
--- a/ldns/dnssec_verify.h
+++ b/ldns/dnssec_verify.h
@@ -224,8 +224,7 @@ ldns_dnssec_trust_tree *ldns_dnssec_derive_trust_tree(
 					   ldns_rr *rr);
 
 /**
- * Sub function for derive_trust_tree that is used for a
- * 'normal' rrset
+ * Sub function for derive_trust_tree that is used for a 'normal' rrset
  *
  * \param[in] new_tree The trust tree that we are building
  * \param[in] data_chain The data chain containing the data for the trust tree