Remove file_id entirely
It is not used anymore. Signed-off-by: Ran Benita <ran234@gmail.com>master
parent
64c002627d
commit
56ba986613
|
@ -47,9 +47,6 @@ struct xkb_context {
|
||||||
darray(char *) includes;
|
darray(char *) includes;
|
||||||
darray(char *) failed_includes;
|
darray(char *) failed_includes;
|
||||||
|
|
||||||
/* xkbcomp needs to assign sequential IDs to XkbFile's it creates. */
|
|
||||||
unsigned file_id;
|
|
||||||
|
|
||||||
struct atom_table *atom_table;
|
struct atom_table *atom_table;
|
||||||
|
|
||||||
/* Buffer for the *Text() functions. */
|
/* 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);
|
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.
|
* Take a new reference on the context.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -28,9 +28,6 @@
|
||||||
|
|
||||||
#include "atom.h"
|
#include "atom.h"
|
||||||
|
|
||||||
unsigned
|
|
||||||
xkb_context_take_file_id(struct xkb_context *ctx);
|
|
||||||
|
|
||||||
unsigned int
|
unsigned int
|
||||||
xkb_context_num_failed_include_paths(struct xkb_context *ctx);
|
xkb_context_num_failed_include_paths(struct xkb_context *ctx);
|
||||||
|
|
||||||
|
|
|
@ -503,7 +503,6 @@ XkbFileCreate(struct xkb_context *ctx, enum xkb_file_type type, char *name,
|
||||||
file->topName = strdup_safe(name);
|
file->topName = strdup_safe(name);
|
||||||
file->name = name;
|
file->name = name;
|
||||||
file->defs = defs;
|
file->defs = defs;
|
||||||
file->id = xkb_context_take_file_id(ctx);
|
|
||||||
file->flags = flags;
|
file->flags = flags;
|
||||||
|
|
||||||
return file;
|
return file;
|
||||||
|
|
|
@ -289,7 +289,6 @@ typedef struct {
|
||||||
char *topName;
|
char *topName;
|
||||||
char *name;
|
char *name;
|
||||||
ParseCommon *defs;
|
ParseCommon *defs;
|
||||||
int id;
|
|
||||||
enum xkb_map_flags flags;
|
enum xkb_map_flags flags;
|
||||||
} XkbFile;
|
} XkbFile;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue