summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2013-03-04 14:16:36 +0200
committerDaniel Stone <daniel@fooishbar.org>2013-03-18 22:20:05 +0000
commit56ba986613cb0e220f4b08b1d99f8eed05aead56 (patch)
tree37c4681d80ce2cde4bad05c45d6188533bb73309
parent64c002627d4a60cf8de6841cffb699e987a9f9ba (diff)
Remove file_id entirely
It is not used anymore. Signed-off-by: Ran Benita <ran234@gmail.com>
-rw-r--r--src/context.c9
-rw-r--r--src/context.h3
-rw-r--r--src/xkbcomp/ast-build.c1
-rw-r--r--src/xkbcomp/ast.h1
4 files changed, 0 insertions, 14 deletions
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;