[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2761-g2b5425e

[Herb Lewis]

The branch, v3-2-test has been updated
       via  2b5425efddfccb1010d082e6133cfdd79d72729e (commit)
      from  76061eee93fd67b96916a088c64a038e47a48814 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 2b5425efddfccb1010d082e6133cfdd79d72729e
Author: Herb Lewis <herb at samba.org>
Date:   Tue Jul 22 17:50:33 2008 -0700

    get rid of unused variable warnings when HAVE_IPV6 not defined

-----------------------------------------------------------------------

Summary of changes:
 source/lib/util_sock.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index 822ff26..7356b3e 100644
--- a/source/lib/util_sock.c
+++ b/source/lib/util_sock.c
@@ -43,9 +43,9 @@ bool is_ipaddress_v4(const char *str)
 
 bool is_ipaddress(const char *str)
 {
+#if defined(HAVE_IPV6)
 	int ret = -1;
 
-#if defined(HAVE_IPV6)
 	if (strchr_m(str, ':')) {
 		char addr[INET6_ADDRSTRLEN];
 		struct in6_addr dest6;
@@ -212,9 +212,9 @@ bool interpret_string_addr(struct sockaddr_storage *pss,
 		const char *str,
 		int flags)
 {
-	char addr[INET6_ADDRSTRLEN];
 	struct addrinfo *res = NULL;
 #if defined(HAVE_IPV6)
+	char addr[INET6_ADDRSTRLEN];
 	unsigned int scope_id = 0;
 
 	if (strchr_m(str, ':')) {


-- 
Samba Shared Repository