oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

rename base to base_id since flex defines a function with the argument base

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15426 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-06-16 19:21:42 +00:00
parent b5454e78eb
commit f0cdb49457
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/com_err/compile_et.c
View File

@@ -46,7 +46,7 @@ extern FILE *yyin;
extern void yyparse(void); extern void yyparse(void);
long base; long base_id;
int number; int number;
char *prefix; char *prefix;
char *id_str; char *id_str;
@@ -156,13 +156,13 @@ generate_h(void)
fprintf(h_file, "typedef enum %s_error_number{\n", name); fprintf(h_file, "typedef enum %s_error_number{\n", name);
for(ec = codes; ec; ec = ec->next) { for(ec = codes; ec; ec = ec->next) {
fprintf(h_file, "\t%s = %ld%s\n", ec->name, base + ec->number, fprintf(h_file, "\t%s = %ld%s\n", ec->name, base_id + ec->number,
(ec->next != NULL) ? "," : ""); (ec->next != NULL) ? "," : "");
} }
fprintf(h_file, "} %s_error_number;\n", name); fprintf(h_file, "} %s_error_number;\n", name);
fprintf(h_file, "\n"); fprintf(h_file, "\n");
fprintf(h_file, "#define ERROR_TABLE_BASE_%s %ld\n", name, base); fprintf(h_file, "#define ERROR_TABLE_BASE_%s %ld\n", name, base_id);
fprintf(h_file, "\n"); fprintf(h_file, "\n");
fprintf(h_file, "#endif /* %s */\n", fn); fprintf(h_file, "#endif /* %s */\n", fn);

2
lib/com_err/compile_et.h
View File

@@ -48,7 +48,7 @@
#include <ctype.h> #include <ctype.h>
#include <roken.h> #include <roken.h>
extern long base; extern long base_id;
extern int number; extern int number;
extern char *prefix; extern char *prefix;
extern char name[128]; extern char name[128];

4
lib/com_err/parse.y
View File

@@ -77,13 +77,13 @@ id : ID STRING
et : ET STRING et : ET STRING
{ {
base = name2number($2); base_id = name2number($2);
strlcpy(name, $2, sizeof(name)); strlcpy(name, $2, sizeof(name));
free($2); free($2);
} }
| ET STRING STRING | ET STRING STRING
{ {
base = name2number($2); base_id = name2number($2);
strlcpy(name, $3, sizeof(name)); strlcpy(name, $3, sizeof(name));
free($2); free($2);
free($3); free($3);