Cleanup CRYPTO_{push,pop}_info

[openssl.git] / crypto / asn1 / tasn_new.c

diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c
index 668f6419d1cb63b00945937642098a7d3c815f81..9362ca2662e254ff5f8fffdf67b725f238f6a8ce 100644 (file)
--- a/crypto/asn1/tasn_new.c
+++ b/crypto/asn1/tasn_new.c
@@ -103,8 +103,7 @@ int asn1_item_embed_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int embed)
         asn1_cb = 0;
 
 #ifdef CRYPTO_MDEBUG
         asn1_cb = 0;
 
 #ifdef CRYPTO_MDEBUG

-    if (it->sname)
-        CRYPTO_push_info(it->sname);
+    OPENSSL_mem_debug_push(it->sname ? it->sname : "asn1_item_embed_new");

 #endif
 
     switch (it->itype) {
 #endif
 
     switch (it->itype) {


@@ -137,8 +136,7 @@ int asn1_item_embed_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int embed)
                 goto auxerr;
             if (i == 2) {
 #ifdef CRYPTO_MDEBUG
                 goto auxerr;
             if (i == 2) {
 #ifdef CRYPTO_MDEBUG

-                if (it->sname)
-                    CRYPTO_pop_info();
+                OPENSSL_mem_debug_pop();

 #endif
                 return 1;
             }
 #endif
                 return 1;
             }


@@ -163,8 +161,7 @@ int asn1_item_embed_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int embed)
                 goto auxerr;
             if (i == 2) {
 #ifdef CRYPTO_MDEBUG
                 goto auxerr;
             if (i == 2) {
 #ifdef CRYPTO_MDEBUG

-                if (it->sname)
-                    CRYPTO_pop_info();
+                OPENSSL_mem_debug_pop();

 #endif
                 return 1;
             }
 #endif
                 return 1;
             }


@@ -188,16 +185,14 @@ int asn1_item_embed_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int embed)
         break;
     }
 #ifdef CRYPTO_MDEBUG
         break;
     }
 #ifdef CRYPTO_MDEBUG

-    if (it->sname)
-        CRYPTO_pop_info();
+    OPENSSL_mem_debug_pop();

 #endif
     return 1;
 
  memerr:
     ASN1err(ASN1_F_ASN1_ITEM_EMBED_NEW, ERR_R_MALLOC_FAILURE);
 #ifdef CRYPTO_MDEBUG
 #endif
     return 1;
 
  memerr:
     ASN1err(ASN1_F_ASN1_ITEM_EMBED_NEW, ERR_R_MALLOC_FAILURE);
 #ifdef CRYPTO_MDEBUG

-    if (it->sname)
-        CRYPTO_pop_info();
+    OPENSSL_mem_debug_pop();

 #endif
     return 0;
 
 #endif
     return 0;
 


@@ -205,8 +200,7 @@ int asn1_item_embed_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int embed)
     ASN1err(ASN1_F_ASN1_ITEM_EMBED_NEW, ASN1_R_AUX_ERROR);
     ASN1_item_ex_free(pval, it);
 #ifdef CRYPTO_MDEBUG
     ASN1err(ASN1_F_ASN1_ITEM_EMBED_NEW, ASN1_R_AUX_ERROR);
     ASN1_item_ex_free(pval, it);
 #ifdef CRYPTO_MDEBUG

-    if (it->sname)
-        CRYPTO_pop_info();
+    OPENSSL_mem_debug_pop();

 #endif
     return 0;
 
 #endif
     return 0;
 


@@ -266,8 +260,8 @@ static int asn1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
         return 1;
     }
 #ifdef CRYPTO_MDEBUG
         return 1;
     }
 #ifdef CRYPTO_MDEBUG

-    if (tt->field_name)
-        CRYPTO_push_info(tt->field_name);
+    OPENSSL_mem_debug_push(tt->field_name
+            ? tt->field_name : "asn1_template_new");

 #endif
     /* If SET OF or SEQUENCE OF, its a STACK */
     if (tt->flags & ASN1_TFLG_SK_MASK) {
 #endif
     /* If SET OF or SEQUENCE OF, its a STACK */
     if (tt->flags & ASN1_TFLG_SK_MASK) {


@@ -286,8 +280,7 @@ static int asn1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
     ret = asn1_item_embed_new(pval, it, embed);
  done:
 #ifdef CRYPTO_MDEBUG
     ret = asn1_item_embed_new(pval, it, embed);
  done:
 #ifdef CRYPTO_MDEBUG

-    if (it->sname)
-        CRYPTO_pop_info();
+    OPENSSL_mem_debug_pop();

 #endif
     return ret;
 }
 #endif
     return ret;
 }