oidspectool: replacing extern with static for struct ldapschema_spec declarations

2 files changed, 2 insertions, 4 deletions

diff --git a/src/utils/oidspectool/oidspeclexer.l b/src/utils/oidspectool/oidspeclexer.l
index 6ed02d2..2b91c93 100644
--- a/src/utils/oidspectool/oidspeclexer.l
+++ b/src/utils/oidspectool/oidspeclexer.l
@@ -49,6 +49,7 @@ int yylex();
 "#"[a-zA-Z0-9]+[^\n]*[\n]           ; /* ignore C preprocessor directives */
 
 "const "[^\n]+"="[^\n]*[\n]         ; /* ignore non-code blocks (allows oidspectool to process its own output) */
+"static "[^\n]+"="[^\n]*[\n]        ; /* ignore non-code blocks (allows oidspectool to process its own output) */
 "&"[_a-zA-Z0-9]+","                 ; /* ignore pointer references (allows oidspectool to process its own output) */
 
 "("[ \t]*"const"[ \t][ \t*\[\]a-zA-Z0-9_]+")"   { return(CONST_CAST); }
diff --git a/src/utils/oidspectool/oidspectool.c b/src/utils/oidspectool/oidspectool.c
index 99aeea7..35a62a2 100644
--- a/src/utils/oidspectool/oidspectool.c
+++ b/src/utils/oidspectool/oidspectool.c
@@ -721,9 +721,6 @@ int my_save_header(FILE * fs)
    fprintf(fs, "\n");
 
    // save OID specs
-   for(pos = 0; pos < oidspeclist_len; pos++)
-      fprintf(fs, "extern %s %s%zu;\n", cfg.type, cfg.name, pos);
-   fprintf(fs, "\n");
    fprintf(fs, "extern const size_t %s_len;\n", cfg.name);
    fprintf(fs, "extern %s * %s[];\n", cfg.type, cfg.name);
    fprintf(fs, "\n\n#endif /* end of header */\n");
@@ -796,7 +793,7 @@ int my_save_source_oidspec(FILE * fs, OIDSpec * oidspec, size_t idx)
 
    fprintf(fs, "// %s\n", oidspec->oid[0]);
    fprintf(fs, "// %s:%i\n", my_fs_prunepath(oidspec->filename), oidspec->lineno);
-   fprintf(fs, "%s %s%zu =\n", cfg.type, cfg.name, idx);
+   fprintf(fs, "static %s %s%zu =\n", cfg.type, cfg.name, idx);
    fprintf(fs, "{\n");
    my_save_source_oidspec_strs(fs, ".oid",            oidspec->oid);
    my_save_source_oidspec_strs(fs, ".name",           oidspec->name);