From ba859e47b072442c8285100d745c0c14c332dab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Wed, 11 Feb 2009 05:58:10 +0000 Subject: [PATCH] Export oid as variable, simplies codebase. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24671 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/asn1/gen.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/asn1/gen.c b/lib/asn1/gen.c index cf4153246..19ddc03a8 100644 --- a/lib/asn1/gen.c +++ b/lib/asn1/gen.c @@ -321,8 +321,12 @@ generate_constant (const Symbol *s) } fprintf (headerfile, "} */\n"); - fprintf (headerfile, "const heim_oid *oid_%s(void);\n\n", + fprintf (headerfile, "const heim_oid *oid_%s(void);\n", s->gen_name); + fprintf (headerfile, + "extern const heim_oid asn1_oid_%s;\n\n", + s->gen_name); + fprintf (codefile, "static unsigned oid_%s_variable_num[%d] = {", s->gen_name, len); @@ -331,13 +335,13 @@ generate_constant (const Symbol *s) } fprintf(codefile, "};\n"); - fprintf (codefile, "static const heim_oid oid_%s_variable = " + fprintf (codefile, "const heim_oid asn1_oid_%s_variable = " "{ %d, oid_%s_variable_num };\n\n", s->gen_name, len, s->gen_name); fprintf (codefile, "const heim_oid *oid_%s(void)\n" "{\n" - "return &oid_%s_variable;\n" + "return &asn1_oid_%s_variable;\n" "}\n\n", s->gen_name, s->gen_name);