prefix typedef\'s and structs with heim_

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12438 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-07-15 13:57:32 +00:00
parent 72c26c7cce
commit 939b444ca3
10 changed files with 77 additions and 75 deletions

View File

@@ -97,21 +97,21 @@ init_generate (const char *filename, const char *base)
"#ifndef __asn1_common_definitions__\n"
"#define __asn1_common_definitions__\n\n");
fprintf (headerfile,
"typedef struct octet_string {\n"
"typedef struct heim_octet_string {\n"
" size_t length;\n"
" void *data;\n"
"} octet_string;\n\n");
"} heim_octet_string;\n\n");
fprintf (headerfile,
"typedef char *general_string;\n\n"
"typedef char *heim_general_string;\n\n"
);
fprintf (headerfile,
"typedef char *utf8_string;\n\n"
"typedef char *heim_utf8_string;\n\n"
);
fprintf (headerfile,
"typedef struct oid {\n"
"typedef struct heim_oid {\n"
" size_t length;\n"
" unsigned *components;\n"
"} oid;\n\n");
"} heim_oid;\n\n");
fputs("#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R) \\\n"
" do { \\\n"
" (BL) = length_##T((S)); \\\n"
@@ -315,11 +315,11 @@ define_type (int level, char *name, Type *t, int typedefp)
break;
case TOctetString:
space(level);
fprintf (headerfile, "octet_string %s;\n", name);
fprintf (headerfile, "heim_octet_string %s;\n", name);
break;
case TOID :
space(level);
fprintf (headerfile, "oid %s;\n", name);
fprintf (headerfile, "heim_oid %s;\n", name);
break;
case TBitString: {
Member *m;
@@ -401,7 +401,7 @@ define_type (int level, char *name, Type *t, int typedefp)
break;
case TGeneralString:
space(level);
fprintf (headerfile, "general_string %s;\n", name);
fprintf (headerfile, "heim_general_string %s;\n", name);
break;
case TUTF8String:
space(level);