From owner-svn-src-all@FreeBSD.ORG Sat Jul 12 05:59:20 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BA06366D; Sat, 12 Jul 2014 05:59:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8CF4D21EB; Sat, 12 Jul 2014 05:59:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6C5xK6g056190; Sat, 12 Jul 2014 05:59:20 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6C5xJNP056186; Sat, 12 Jul 2014 05:59:19 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201407120559.s6C5xJNP056186@svn.freebsd.org> From: Cy Schubert Date: Sat, 12 Jul 2014 05:59:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r268563 - stable/10/contrib/ipfilter/lib X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jul 2014 05:59:20 -0000 Author: cy Date: Sat Jul 12 05:59:19 2014 New Revision: 268563 URL: http://svnweb.freebsd.org/changeset/base/268563 Log: MFC r268286: Fix compile-time errors when NO_WERROR and WITHOUT_INET6_SUPPORT (NO_INET6) are specified. Approved by: glebius (mentor) Modified: stable/10/contrib/ipfilter/lib/printhost.c stable/10/contrib/ipfilter/lib/printhostmask.c stable/10/contrib/ipfilter/lib/save_v1trap.c stable/10/contrib/ipfilter/lib/save_v2trap.c Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/ipfilter/lib/printhost.c ============================================================================== --- stable/10/contrib/ipfilter/lib/printhost.c Sat Jul 12 05:46:33 2014 (r268562) +++ stable/10/contrib/ipfilter/lib/printhost.c Sat Jul 12 05:59:19 2014 (r268563) @@ -23,9 +23,9 @@ printhost(family, addr) if ((family == -1) || !*addr) PRINTF("any"); else { +#ifdef USE_INET6 void *ptr = addr; -#ifdef USE_INET6 PRINTF("%s", inet_ntop(family, ptr, ipbuf, sizeof(ipbuf))); #else ipa.s_addr = *addr; Modified: stable/10/contrib/ipfilter/lib/printhostmask.c ============================================================================== --- stable/10/contrib/ipfilter/lib/printhostmask.c Sat Jul 12 05:46:33 2014 (r268562) +++ stable/10/contrib/ipfilter/lib/printhostmask.c Sat Jul 12 05:59:19 2014 (r268563) @@ -25,9 +25,9 @@ printhostmask(family, addr, mask) if ((family == -1) || ((!addr || !*addr) && (!mask || !*mask))) PRINTF("any"); else { +#ifdef USE_INET6 void *ptr = addr; -#ifdef USE_INET6 PRINTF("%s", inet_ntop(family, ptr, ipbuf, sizeof(ipbuf))); #else ipa.s_addr = *addr; Modified: stable/10/contrib/ipfilter/lib/save_v1trap.c ============================================================================== --- stable/10/contrib/ipfilter/lib/save_v1trap.c Sat Jul 12 05:46:33 2014 (r268562) +++ stable/10/contrib/ipfilter/lib/save_v1trap.c Sat Jul 12 05:59:19 2014 (r268563) @@ -178,7 +178,7 @@ snmpv1_parse(char **strings) if (ctx->fd >= 0) { ctx->sin.sin_family = AF_INET; ctx->sin.sin_port = htons(162); - if (connect(ctx->fd, &ctx->sin, + if (connect(ctx->fd, (struct sockaddr *)&ctx->sin, sizeof(ctx->sin)) != 0) { snmpv1_destroy(ctx); return NULL; Modified: stable/10/contrib/ipfilter/lib/save_v2trap.c ============================================================================== --- stable/10/contrib/ipfilter/lib/save_v2trap.c Sat Jul 12 05:46:33 2014 (r268562) +++ stable/10/contrib/ipfilter/lib/save_v2trap.c Sat Jul 12 05:59:19 2014 (r268563) @@ -181,7 +181,7 @@ snmpv2_parse(char **strings) if (ctx->fd >= 0) { ctx->sin.sin_family = AF_INET; ctx->sin.sin_port = htons(162); - if (connect(ctx->fd, &ctx->sin, + if (connect(ctx->fd, (struct sockaddr *)&ctx->sin, sizeof(ctx->sin)) != 0) { snmpv2_destroy(ctx); return NULL;