Index: openssl/crypto/asn1/asn1_par.c |
=================================================================== |
--- openssl/crypto/asn1/asn1_par.c (revision 105093) |
+++ openssl/crypto/asn1/asn1_par.c (working copy) |
@@ -70,9 +70,8 @@ |
int indent) |
{ |
static const char fmt[]="%-18s"; |
- static const char fmt2[]="%2d %-15s"; |
char str[128]; |
- const char *p,*p2=NULL; |
+ const char *p; |
if (constructed & V_ASN1_CONSTRUCTED) |
p="cons: "; |
@@ -93,14 +92,8 @@ |
else |
p = ASN1_tag2str(tag); |
- if (p2 != NULL) |
- { |
- if (BIO_printf(bp,fmt2,tag,p2) <= 0) goto err; |
- } |
- else |
- { |
- if (BIO_printf(bp,fmt,p) <= 0) goto err; |
- } |
+ if (BIO_printf(bp,fmt,p) <= 0) |
+ goto err; |
return(1); |
err: |
return(0); |
@@ -424,7 +417,7 @@ |
const char *ASN1_tag2str(int tag) |
{ |
- static const char *tag2str[] = { |
+ static const char * const tag2str[] = { |
"EOC", "BOOLEAN", "INTEGER", "BIT STRING", "OCTET STRING", /* 0-4 */ |
"NULL", "OBJECT", "OBJECT DESCRIPTOR", "EXTERNAL", "REAL", /* 5-9 */ |
"ENUMERATED", "<ASN1 11>", "UTF8STRING", "<ASN1 13>", /* 10-13 */ |