Expand obsolete M_ASN1_STRING_* macros in asn1_lib.c, apply some style(9)

and drop an unnecessary return from a void function.

ok bcook@ doug@

2 files changed, 10 insertions, 12 deletions

diff --git a/src/lib/libcrypto/asn1/asn1_lib.c b/src/lib/libcrypto/asn1/asn1_lib.c
index 383d604e60..5d14a2780f 100644
--- a/src/lib/libcrypto/asn1/asn1_lib.c
+++ b/src/lib/libcrypto/asn1/asn1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1_lib.c,v 1.35 2015/07/27 12:53:56 jsing Exp $ */
+/* $OpenBSD: asn1_lib.c,v 1.36 2015/07/29 14:53:20 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -464,24 +464,23 @@ asn1_add_error(const unsigned char *address, int offset)
 int
 ASN1_STRING_length(const ASN1_STRING *x)
 {
-        return M_ASN1_STRING_length(x);
+        return (x->length);
 }
 
 void
 ASN1_STRING_length_set(ASN1_STRING *x, int len)
 {
-        M_ASN1_STRING_length_set(x, len);
-        return;
+        x->length = len;
 }
 
 int
 ASN1_STRING_type(ASN1_STRING *x)
 {
-        return M_ASN1_STRING_type(x);
+        return (x->type);
 }
 
 unsigned char *
 ASN1_STRING_data(ASN1_STRING *x)
 {
-        return M_ASN1_STRING_data(x);
+        return (x->data);
 }
diff --git a/src/lib/libssl/src/crypto/asn1/asn1_lib.c b/src/lib/libssl/src/crypto/asn1/asn1_lib.c
index 383d604e60..5d14a2780f 100644
--- a/src/lib/libssl/src/crypto/asn1/asn1_lib.c
+++ b/src/lib/libssl/src/crypto/asn1/asn1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1_lib.c,v 1.35 2015/07/27 12:53:56 jsing Exp $ */
+/* $OpenBSD: asn1_lib.c,v 1.36 2015/07/29 14:53:20 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -464,24 +464,23 @@ asn1_add_error(const unsigned char *address, int offset)
 int
 ASN1_STRING_length(const ASN1_STRING *x)
 {
-        return M_ASN1_STRING_length(x);
+        return (x->length);
 }
 
 void
 ASN1_STRING_length_set(ASN1_STRING *x, int len)
 {
-        M_ASN1_STRING_length_set(x, len);
-        return;
+        x->length = len;
 }
 
 int
 ASN1_STRING_type(ASN1_STRING *x)
 {
-        return M_ASN1_STRING_type(x);
+        return (x->type);
 }
 
 unsigned char *
 ASN1_STRING_data(ASN1_STRING *x)
 {
-        return M_ASN1_STRING_data(x);
+        return (x->data);
 }