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; _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"