Remove NOPROTO definitions and error code comments.

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

diff --git a/crypto/asn1/f_string.c b/crypto/asn1/f_string.c
index 68001c324545949eddb62b7bb253690d1cb871f4..9bcc5a93c9dc82161f42724aae17640db4a3ffff 100644 (file)
--- a/crypto/asn1/f_string.c
+++ b/crypto/asn1/f_string.c
@@ -1,5 +1,5 @@
 /* crypto/asn1/f_string.c */
 /* crypto/asn1/f_string.c */

-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

  * All rights reserved.
  *
  * This package is an SSL implementation written
  * All rights reserved.
  *
  * This package is an SSL implementation written


@@ -58,16 +58,13 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
 
 #include <stdio.h>
 #include "cryptlib.h"

-#include "buffer.h"
-#include "x509.h"
+#include <openssl/buffer.h>
+#include <openssl/x509.h>

 
 

-int i2a_ASN1_STRING(bp, a, type)
-BIO *bp;
-ASN1_STRING *a;
-int type;
+int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type)

        {
        int i,n=0;
        {
        int i,n=0;

-       static char *h="0123456789ABCDEF";
+       static const char *h="0123456789ABCDEF";

        char buf[2];
 
        if (a == NULL) return(0);
        char buf[2];
 
        if (a == NULL) return(0);


@@ -97,11 +94,7 @@ err:
        return(-1);
        }
 
        return(-1);
        }
 

-int a2i_ASN1_STRING(bp,bs,buf,size)
-BIO *bp;
-ASN1_STRING *bs;
-char *buf;
-int size;
+int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)

        {
        int ret=0;
        int i,j,k,m,n,again,bufsize;
        {
        int ret=0;
        int i,j,k,m,n,again,bufsize;