changed asn1_locl.h to gen_locl.h and der_locl.h

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2328 ec53bebd-3082-4978-b11e-865c3cabbd6b

lib/asn1/der_copy.c

@@ -1,4 +1,4 @@
-#include "libasn1.h"
+#include "der_locl.h"
 
 RCSID("$Id$");
 

lib/asn1/der_free.c

@@ -1,4 +1,4 @@
-#include "libasn1.h"
+#include "der_locl.h"
 
 RCSID("$Id$");
 

lib/asn1/der_get.c

@@ -1,4 +1,4 @@
-#include "libasn1.h"
+#include "der_locl.h"
 
 RCSID("$Id$");
 

lib/asn1/der_length.c

@@ -1,4 +1,4 @@
-#include "libasn1.h"
+#include "der_locl.h"
 
 RCSID("$Id$");
 

lib/asn1/der_locl.h

@@ -0,0 +1,21 @@
+/* $Id$ */
+
+#ifndef __DER_LOCL_H__
+#define __DER_LOCL_H__
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <ctype.h>
+#include <time.h>
+#include <errno.h>
+#include <roken.h>
+
+#include <libasn1.h>
+
+#endif /* __DER_LOCL_H__ */

lib/asn1/der_put.c

@@ -1,6 +1,4 @@
-/* $Id$ */
+#include "der_locl.h"
-
-#include "libasn1.h"
 
 RCSID("$Id$");
 

lib/asn1/gen.c

@@ -1,4 +1,4 @@
-#include "asn1_locl.h"
+#include "gen_locl.h"
 
 RCSID("$Id$");
 

lib/asn1/gen_copy.c

@@ -1,4 +1,4 @@
-#include "asn1_locl.h"
+#include "gen_locl.h"
 
 RCSID("$Id$");
 

lib/asn1/gen_decode.c

@@ -1,4 +1,4 @@
-#include "asn1_locl.h"
+#include "gen_locl.h"
 
 RCSID("$Id$");
 
@@ -139,8 +139,8 @@ decode_type (char *name, Type *t)
 	  decode_type (s, m->type);
 	  fprintf (codefile,
 		   "if(dce_fix){\n"
-		   "e = der_match_tag_and_length (p, len, 0, 0, 0, "
+		   "e = der_match_tag_and_length (p, len, "
-		   "&reallen, &l);\n"
+		   "(Der_class)0, (Der_type)0, 0, &reallen, &l);\n"
 		   "FORW;\n"
 		   "}else \n"
 		   "len = oldlen - newlen;\n"
@@ -155,7 +155,8 @@ decode_type (char *name, Type *t)
     }
     fprintf(codefile,
 	    "if(dce_fix){\n"
-	    "e = der_match_tag_and_length (p, len, 0, 0, 0, &reallen, &l);\n"
+	    "e = der_match_tag_and_length (p, len, "
+	    "(Der_class)0, (Der_type)0, 0, &reallen, &l);\n"
 	    "FORW;\n"
 	    "}\n"
 	    "}\n");
@@ -206,7 +207,8 @@ decode_type (char *name, Type *t)
     decode_type (name, t->subtype);
     fprintf(codefile,
 	    "if(dce_fix){\n"
-	    "e = der_match_tag_and_length (p, len, 0, 0, 0, &reallen, &l);\n"
+	    "e = der_match_tag_and_length (p, len, "
+	    "(Der_class)0, (Der_type)0, 0, &reallen, &l);\n"
 	    "FORW;\n"
 	    "}\n"
 	    "}\n");
@@ -315,7 +317,8 @@ generate_seq_type_decode (Symbol *s)
 	     "ret += l;\n"
 	     "if (dce_fix) {\n"
 	     "size_t reallen;\n\n"
-	     "e = der_match_tag_and_length(p, len, 0, 0, 0, &reallen, &l);\n"
+	     "e = der_match_tag_and_length(p, len, "
+	     "(Der_class)0, (Der_type)0, 0, &reallen, &l);\n"
 	     "if (e)\n"
 	     "return e;\n"
 	     "ret += l;\n"

lib/asn1/gen_encode.c

@@ -1,4 +1,4 @@
-#include "asn1_locl.h"
+#include "gen_locl.h"
 
 RCSID("$Id$");
 

lib/asn1/gen_free.c

@@ -1,4 +1,4 @@
-#include "asn1_locl.h"
+#include "gen_locl.h"
 
 RCSID("$Id$");
 

lib/asn1/gen_length.c

@@ -1,4 +1,4 @@
-#include "asn1_locl.h"
+#include "gen_locl.h"
 
 RCSID("$Id$");
 

lib/asn1/gen_locl.h

@@ -0,0 +1,38 @@
+/* $Id$ */
+
+#ifndef __GEN_LOCL_H__
+#define __GEN_LOCL_H__
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <ctype.h>
+#include <time.h>
+#include <errno.h>
+#include <err.h>
+#include <roken.h>
+#include "hash.h"
+#include "symbol.h"
+
+void generate_type (Symbol *);
+void generate_constant (Symbol *);
+void generate_type_encode (Symbol *s);
+void generate_type_decode (Symbol *s);
+void generate_seq_type_decode (Symbol *s);
+void generate_type_free (Symbol *s);
+void generate_type_length (Symbol *s);
+void generate_type_copy (Symbol *s);
+void generate_type_maybe (Symbol *s);
+
+void init_generate (char *filename);
+void close_generate(void);
+int yyparse(void);
+
+extern FILE *headerfile, *codefile, *logfile;
+
+#endif /* __GEN_LOCL_H__ */

lib/asn1/gen_maybe.c

@@ -1,4 +1,4 @@
-#include "asn1_locl.h"
+#include "gen_locl.h"
 
 RCSID("$Id$");
 

lib/asn1/hash.c

@@ -2,7 +2,7 @@
  * Hash table functions
  */
 
-#include "asn1_locl.h"
+#include "gen_locl.h"
 
 RCSID("$Id$");
 

lib/asn1/main.c

@@ -1,4 +1,4 @@
-#include "asn1_locl.h"
+#include "gen_locl.h"
 
 RCSID("$Id$");
 

lib/asn1/parse.y

@@ -9,7 +9,7 @@
 #include <string.h>
 #include "symbol.h"
 #include "lex.h"
-#include "asn1_locl.h"
+#include "gen_locl.h"
 
 RCSID("$Id$");
 

lib/asn1/symbol.c

@@ -1,4 +1,4 @@
-#include "asn1_locl.h"
+#include "gen_locl.h"
 
 RCSID("$Id$");
 

lib/asn1/timegm.c

@@ -1,4 +1,4 @@
-#include "asn1_locl.h"
+#include "der_locl.h"
 
 RCSID("$Id$");