Remove file_id entirely It is not used anymore. Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
diff --git a/src/context.c b/src/context.c
index ded10b2..2dd8ea9 100644
--- a/src/context.c
+++ b/src/context.c
@@ -47,9 +47,6 @@ struct xkb_context {
darray(char *) includes;
darray(char *) failed_includes;
- /* xkbcomp needs to assign sequential IDs to XkbFile's it creates. */
- unsigned file_id;
-
struct atom_table *atom_table;
/* Buffer for the *Text() functions. */
@@ -183,12 +180,6 @@ xkb_context_failed_include_path_get(struct xkb_context *ctx,
return darray_item(ctx->failed_includes, idx);
}
-unsigned
-xkb_context_take_file_id(struct xkb_context *ctx)
-{
- return ctx->file_id++;
-}
-
/**
* Take a new reference on the context.
*/
diff --git a/src/context.h b/src/context.h
index fdfdd77..2f94988 100644
--- a/src/context.h
+++ b/src/context.h
@@ -28,9 +28,6 @@
#include "atom.h"
-unsigned
-xkb_context_take_file_id(struct xkb_context *ctx);
-
unsigned int
xkb_context_num_failed_include_paths(struct xkb_context *ctx);
diff --git a/src/xkbcomp/ast-build.c b/src/xkbcomp/ast-build.c
index 79b579c..c9b7cb0 100644
--- a/src/xkbcomp/ast-build.c
+++ b/src/xkbcomp/ast-build.c
@@ -503,7 +503,6 @@ XkbFileCreate(struct xkb_context *ctx, enum xkb_file_type type, char *name,
file->topName = strdup_safe(name);
file->name = name;
file->defs = defs;
- file->id = xkb_context_take_file_id(ctx);
file->flags = flags;
return file;
diff --git a/src/xkbcomp/ast.h b/src/xkbcomp/ast.h
index c9b801f..c430a77 100644
--- a/src/xkbcomp/ast.h
+++ b/src/xkbcomp/ast.h
@@ -289,7 +289,6 @@ typedef struct {
char *topName;
char *name;
ParseCommon *defs;
- int id;
enum xkb_map_flags flags;
} XkbFile;