Revision: 14591
Author: [email protected]
Date: Sun Apr 11 17:40:11 2010
Log: Tweak variable initializations to suppress compiler warnings on Cygwin/MinGW
http://code.google.com/p/lusca-cache/source/detail?r=14591

Modified:
 /branches/LUSCA_HEAD/libsqinet/sqinet.c

=======================================
--- /branches/LUSCA_HEAD/libsqinet/sqinet.c     Wed Mar 24 20:14:05 2010
+++ /branches/LUSCA_HEAD/libsqinet/sqinet.c     Sun Apr 11 17:40:11 2010
@@ -276,8 +276,9 @@
 sqinet_get_v4_inaddr(const sqaddr_t *s, sqaddr_flags flags)
 {
        struct sockaddr_in *v4;
-       struct in_addr none_addr = { INADDR_NONE };
-
+       struct in_addr none_addr;
+
+       none_addr.s_addr = INADDR_NONE;
        assert(s->init);
        if (flags & SQADDR_ASSERT_IS_V4) {
                assert(s->st.ss_family == AF_INET);
@@ -375,7 +376,6 @@
 {
        struct sockaddr_in *v4;
        struct sockaddr_in6 *v6;
-       struct in6_addr any6addr = IN6ADDR_ANY_INIT;

        assert(s->init);
        switch(s->st.ss_family) {
@@ -385,7 +385,7 @@
                        break;
                case AF_INET6:
                        v6 = (struct sockaddr_in6 *) &s->st;
-                       v6->sin6_addr = any6addr;
+                       v6->sin6_addr = in6addr_any;
                        break;
                default:
                        assert(0);
@@ -411,7 +411,6 @@
 {
        struct sockaddr_in *v4;
        struct sockaddr_in6 *v6;
-       struct in6_addr any6addr = IN6ADDR_ANY_INIT;

        assert(s->init);
        switch(s->st.ss_family) {
@@ -421,7 +420,7 @@
                        break;
                case AF_INET6:
                        v6 = (struct sockaddr_in6 *) &s->st;
-                       return (memcmp(&v6->sin6_addr, &any6addr, 
sizeof(any6addr)) == 0);
+                       return (memcmp(&v6->sin6_addr, &in6addr_any, 
sizeof(in6addr_any)) == 0);
                        break;
                default:
                        assert(0);

--
You received this message because you are subscribed to the Google Groups 
"lusca-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/lusca-commit?hl=en.

Reply via email to