Date: Mon, 18 Aug 2014 18:42:38 GMT From: shonali@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r272637 - soc2014/shonali/head/contrib/bsnmp/snmp_target Message-ID: <201408181842.s7IIgcxX042037@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408181842.s7IIgcxX042037>