long obsolete

[oweals/openssl.git] / crypto / conf / conf.c

diff --git a/crypto/conf/conf.c b/crypto/conf/conf.c
index f2387098e64da5d6d865a7259aac170083232daa..a55ecbb6587a8521b2ce31df80d5019b23a22d19 100644 (file)
--- a/crypto/conf/conf.c
+++ b/crypto/conf/conf.c
@@ -67,7 +67,6 @@
 
 #include "conf_lcl.h"
 
-#ifndef NOPROTO
 static void value_free_hash(CONF_VALUE *a, LHASH *conf);
 static void value_free_stack(CONF_VALUE *a,LHASH *conf);
 static unsigned long hash(CONF_VALUE *v);
@@ -79,20 +78,6 @@ static int str_copy(LHASH *conf,char *section,char **to, char *from);
 static char *scan_quote(char *p);
 static CONF_VALUE *new_section(LHASH *conf,char *section);
 static CONF_VALUE *get_section(LHASH *conf,char *section);
-#else
-static void value_free_hash();
-static void value_free_stack();
-static unsigned long hash();
-static int cmp();
-static char *eat_ws();
-static char *eat_alpha_numeric();
-static void clear_comments();
-static int str_copy();
-static char *scan_quote();
-static CONF_VALUE *new_section();
-static CONF_VALUE *get_section();
-#endif
-
 #define scan_esc(p)    ((((p)[1] == '\0')?(p++):(p+=2)),p)
 
 const char *CONF_version="CONF" OPENSSL_VERSION_PTEXT;
@@ -120,7 +105,11 @@ LHASH *CONF_load(LHASH *h, char *file, long *line)
                goto err;
                }
 
+#ifdef VMS
+       in=fopen(file,"r");
+#else
        in=fopen(file,"rb");
+#endif
        if (in == NULL)
                {
                SYSerr(SYS_F_FOPEN,get_last_sys_error());
@@ -369,7 +358,7 @@ char *CONF_get_string(LHASH *conf, char *section, char *name)
                                if (p != NULL) return(p);
                                }
                        }
-               vv.section=BUF_strdup("default");
+               vv.section="default";
                vv.name=name;
                v=(CONF_VALUE *)lh_retrieve(conf,(char *)&vv);
                if (v != NULL)