From owner-svn-soc-all@FreeBSD.ORG Mon Aug 18 18:42:38 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9D0D124E for ; Mon, 18 Aug 2014 18:42:38 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 88A313740 for ; Mon, 18 Aug 2014 18:42:38 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7IIgcp0042039 for ; Mon, 18 Aug 2014 18:42:38 GMT (envelope-from shonali@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s7IIgcxX042037 for svn-soc-all@FreeBSD.org; Mon, 18 Aug 2014 18:42:38 GMT (envelope-from shonali@FreeBSD.org) Date: Mon, 18 Aug 2014 18:42:38 GMT Message-Id: <201408181842.s7IIgcxX042037@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to shonali@FreeBSD.org using -f From: shonali@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r272637 - soc2014/shonali/head/contrib/bsnmp/snmp_target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Aug 2014 18:42:38 -0000 Author: shonali Date: Mon Aug 18 18:42:37 2014 New Revision: 272637 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=272637 Log: Whitespace corrections Modified: soc2014/shonali/head/contrib/bsnmp/snmp_target/target_snmp.c Modified: soc2014/shonali/head/contrib/bsnmp/snmp_target/target_snmp.c ============================================================================== --- soc2014/shonali/head/contrib/bsnmp/snmp_target/target_snmp.c Mon Aug 18 18:33:39 2014 (r272636) +++ soc2014/shonali/head/contrib/bsnmp/snmp_target/target_snmp.c Mon Aug 18 18:42:37 2014 (r272637) @@ -166,23 +166,23 @@ if (val->v.octetstring.len != SNMP_UDP_ADDR_SIZ && val->v.octetstring.len != SNMP_UDP_ADDRv6_SIZ) return (SNMP_ERR_INCONS_VALUE); - if (val->v.octetstring.len == SNMP_UDP_ADDR_SIZ){ + if (val->v.octetstring.len == SNMP_UDP_ADDR_SIZ){ ctx->scratch->ptr1 = malloc(SNMP_UDP_ADDR_SIZ); - if (ctx->scratch->ptr1 == NULL) - return (SNMP_ERR_GENERR); - memcpy(ctx->scratch->ptr1, addrs->address.address, - SNMP_UDP_ADDR_SIZ); - memcpy(addrs->address.address, val->v.octetstring.octets, - SNMP_UDP_ADDR_SIZ); + if (ctx->scratch->ptr1 == NULL) + return (SNMP_ERR_GENERR); + memcpy(ctx->scratch->ptr1, addrs->address.address, + SNMP_UDP_ADDR_SIZ); + memcpy(addrs->address.address, val->v.octetstring.octets, + SNMP_UDP_ADDR_SIZ); } else if (val->v.octetstring.len == SNMP_UDP_ADDRv6_SIZ){ - ctx->scratch->ptr1 = malloc(SNMP_UDP_ADDRv6_SIZ); - if (ctx->scratch->ptr1 == NULL) - return (SNMP_ERR_GENERR); - memcpy(ctx->scratch->ptr1, addrs->address.address6, - SNMP_UDP_ADDRv6_SIZ); - memcpy(addrs->address.address6, val->v.octetstring.octets, - SNMP_UDP_ADDRv6_SIZ); - } + ctx->scratch->ptr1 = malloc(SNMP_UDP_ADDRv6_SIZ); + if (ctx->scratch->ptr1 == NULL) + return (SNMP_ERR_GENERR); + memcpy(ctx->scratch->ptr1, addrs->address.address6, + SNMP_UDP_ADDRv6_SIZ); + memcpy(addrs->address.address6, val->v.octetstring.octets, + SNMP_UDP_ADDRv6_SIZ); + } break; case LEAF_snmpTargetAddrTagList: @@ -280,15 +280,15 @@ switch (val->var.subs[sub - 1]) { case LEAF_snmpTargetAddrTAddress: - if (val->var.len == SNMP_UDP_ADDR_SIZ) { + if (val->var.len == SNMP_UDP_ADDR_SIZ) { memcpy(addrs->address.address, ctx->scratch->ptr1, SNMP_UDP_ADDR_SIZ); free(ctx->scratch->ptr1); - } else if (val->var.len == SNMP_UDP_ADDRv6_SIZ) { - memcpy(addrs->address.address6, ctx->scratch->ptr1, - SNMP_UDP_ADDRv6_SIZ); - free(ctx->scratch->ptr1); - } + } else if (val->var.len == SNMP_UDP_ADDRv6_SIZ) { + memcpy(addrs->address.address6, ctx->scratch->ptr1, + SNMP_UDP_ADDRv6_SIZ); + free(ctx->scratch->ptr1); + } break; case LEAF_snmpTargetAddrTagList: @@ -327,11 +327,11 @@ case LEAF_snmpTargetAddrTDomain: return (oid_get(val, &oid_udp_domain)); case LEAF_snmpTargetAddrTAddress: - if (val->var.len == SNMP_UDP_ADDR_SIZ) + if (val->var.len == SNMP_UDP_ADDR_SIZ) return (string_get(val, addrs->address.address, SNMP_UDP_ADDR_SIZ)); - if (val->var.len == SNMP_UDP_ADDRv6_SIZ) - return (string_get(val, addrs->address.address6, + if (val->var.len == SNMP_UDP_ADDRv6_SIZ) + return (string_get(val, addrs->address.address6, SNMP_UDP_ADDRv6_SIZ)); case LEAF_snmpTargetAddrTimeout: val->v.integer = addrs->timeout;