A few more ``#ifndef NO_FP_API / #endif'' pairs for consistency.

[openssl.git] / crypto / x509v3 / v3_prn.c

diff --git a/crypto/x509v3/v3_prn.c b/crypto/x509v3/v3_prn.c
index 34bc9c86a51c38df1ba869504391b184594f4bcd..dc20c6bdba60752c1b73f5c7378687aa7e9d4031 100644 (file)
--- a/crypto/x509v3/v3_prn.c
+++ b/crypto/x509v3/v3_prn.c
@@ -59,29 +59,28 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "conf.h"
-#include "x509v3.h"
+#include <openssl/conf.h>
+#include <openssl/x509v3.h>
 
 /* Extension printing routines */
 
 /* Print out a name+value stack */
 
-void X509V3_EXT_val_prn(out, val, indent, ml)
-BIO *out;
-STACK *val;
-int indent;
-int ml;
+void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent, int ml)
 {
        int i;
        CONF_VALUE *nval;
        if(!val) return;
-       if(!ml) BIO_printf(out, "%*s", indent, "");
-       for(i = 0; i < sk_num(val); i++) {
+       if(!ml || !sk_CONF_VALUE_num(val)) {
+               BIO_printf(out, "%*s", indent, "");
+               if(!sk_CONF_VALUE_num(val)) BIO_puts(out, "<EMPTY>\n");
+       }
+       for(i = 0; i < sk_CONF_VALUE_num(val); i++) {
                if(ml) BIO_printf(out, "%*s", indent, "");
                else if(i > 0) BIO_printf(out, ", ");
-               nval = (CONF_VALUE *)sk_value(val, i);
-               if(!nval->name) BIO_printf(out, "%s", nval->value);
-               else if(!nval->value) BIO_printf(out, "%s", nval->name);
+               nval = sk_CONF_VALUE_value(val, i);
+               if(!nval->name) BIO_puts(out, nval->value);
+               else if(!nval->value) BIO_puts(out, nval->name);
                else BIO_printf(out, "%s:%s", nval->name, nval->value);
                if(ml) BIO_puts(out, "\n");
        }
@@ -89,15 +88,12 @@ int ml;
 
 /* Main routine: print out a general extension */
 
-int X509V3_EXT_print(out, ext, flag, indent)
-BIO *out;
-X509_EXTENSION *ext;
-int flag;
-int indent;
+int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, int flag, int indent)
 {
-       char *ext_str = NULL, *p, *value = NULL;
+       char *ext_str = NULL, *value = NULL;
+       unsigned char *p;
        X509V3_EXT_METHOD *method;      
-       STACK *nval = NULL;
+       STACK_OF(CONF_VALUE) *nval = NULL;
        int ok = 1;
        if(!(method = X509V3_EXT_get(ext))) return 0;
        p = ext->value->data;
@@ -120,17 +116,14 @@ int indent;
        } else ok = 0;
 
        err:
-               sk_pop_free(nval, X509V3_conf_free);
+               sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
                if(value) Free(value);
                method->ext_free(ext_str);
                return ok;
 }
 
-int X509V3_EXT_print_fp(fp, ext, flag, indent)
-FILE *fp;
-X509_EXTENSION *ext;
-int flag;
-int indent;
+#ifndef NO_FP_API
+int X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent)
 {
        BIO *bio_tmp;
        int ret;
@@ -139,3 +132,4 @@ int indent;
        BIO_free(bio_tmp);
        return ret;
 }
+#endif