- Removed compile warnings in pythonmod sockaddr routines.

git-svn-id: file:///svn/unbound/trunk@4963 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index ad30fb054d7523f67ebcf209dacccfc830b8bdfc..d02f00a61d9c4faa5a70f5848b980041147a7e9f 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
        - Add patch from Jan Vcelak for pythonmod,
          add sockaddr_storage getters, add support for query callbacks,
          allow raw address access via comm_reply and update API documentation.
+       - Removed compile warnings in pythonmod sockaddr routines.
 
 19 November 2018: Wouter
        - Support SO_REUSEPORT_LB in FreeBSD 12 with the so-reuseport: yes

diff --git a/pythonmod/interface.i b/pythonmod/interface.i
index 6bb2b9edb240593661f796b96f8ea364548031e6..68e0975aaa070f45528d60705178523429112f25 100644 (file)
--- a/pythonmod/interface.i
+++ b/pythonmod/interface.i
@@ -464,17 +464,20 @@ struct sockaddr_storage {};
     }
 
     PyObject *_sockaddr_storage_addr(const struct sockaddr_storage *ss) {
+        const struct sockaddr *sa;
+        size_t sa_len;
+        char name[NI_MAXHOST] = {0};
+
         if (ss == NULL) {
             return Py_None;
         }
 
-        const struct sockaddr *sa = (struct sockaddr *)ss;
-        size_t sa_len = _sockaddr_storage_len(ss);
+        sa = (struct sockaddr *)ss;
+        sa_len = _sockaddr_storage_len(ss);
         if (sa_len == 0) {
             return Py_None;
         }
 
-        char name[NI_MAXHOST] = {0};
         if (getnameinfo(sa, sa_len, name, sizeof(name), NULL, 0, NI_NUMERICHOST) != 0) {
             return Py_None;
         }
@@ -483,11 +486,13 @@ struct sockaddr_storage {};
     }
 
     PyObject *_sockaddr_storage_raw_addr(const struct sockaddr_storage *ss) {
+        size_t sa_len;
+
         if (ss == NULL) {
             return Py_None;
         }
 
-        size_t sa_len = _sockaddr_storage_len(ss);
+        sa_len = _sockaddr_storage_len(ss);
         if (sa_len == 0) {
             return Py_None;
         }
@@ -531,20 +536,24 @@ struct sockaddr_storage {};
     }
 
     PyObject *_sockaddr_storage_flowinfo(const struct sockaddr_storage *ss) {
+        const struct sockaddr_in6 *sa6;
+
         if (ss == NULL || ss->ss_family != AF_INET6) {
             return Py_None;
         }
 
-        const struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)ss;
+        sa6 = (struct sockaddr_in6 *)ss;
         return PyInt_FromLong(ntohl(sa6->sin6_flowinfo));
     }
 
     PyObject *_sockaddr_storage_scope_id(const struct sockaddr_storage *ss) {
+        const struct sockaddr_in6 *sa6;
+
         if (ss == NULL || ss->ss_family != AF_INET6) {
             return Py_None;
         }
 
-        const struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)ss;
+        sa6 = (struct sockaddr_in6 *)ss;
         return PyInt_FromLong(ntohl(sa6->sin6_scope_id));
     }
 %}