IncludeStmt: Remove useless 'path' member Signed-off-by: Daniel Stone <daniel@fooishbar.org>
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
diff --git a/src/xkbcomp/misc.c b/src/xkbcomp/misc.c
index 4db4ac2..a80502d 100644
--- a/src/xkbcomp/misc.c
+++ b/src/xkbcomp/misc.c
@@ -50,7 +50,7 @@ ProcessIncludeFile(struct xkb_context *ctx,
FILE *file;
XkbFile *rtrn, *mapToUse, *next;
- file = XkbFindFileInPath(ctx, stmt->file, file_type, &stmt->path);
+ file = XkbFindFileInPath(ctx, stmt->file, file_type, NULL);
if (file == NULL) {
log_err(ctx, "Can't find file \"%s\" for %s include\n", stmt->file,
XkbDirectoryForInclude(file_type));
diff --git a/src/xkbcomp/parseutils.c b/src/xkbcomp/parseutils.c
index 89b7e8d..fb6271d 100644
--- a/src/xkbcomp/parseutils.c
+++ b/src/xkbcomp/parseutils.c
@@ -419,7 +419,6 @@ IncludeCreate(struct xkb_context *ctx, char *str, enum merge_mode merge)
incl->file = file;
incl->map = map;
incl->modifier = extra_data;
- incl->path = NULL;
incl->next_incl = NULL;
if (nextop == '|')
@@ -569,7 +568,6 @@ FreeInclude(IncludeStmt *incl)
free(incl->file);
free(incl->map);
free(incl->modifier);
- free(incl->path);
free(incl->stmt);
free(incl);
diff --git a/src/xkbcomp/xkbcomp.h b/src/xkbcomp/xkbcomp.h
index 6774c7a..67744ef 100644
--- a/src/xkbcomp/xkbcomp.h
+++ b/src/xkbcomp/xkbcomp.h
@@ -95,7 +95,6 @@ typedef struct _IncludeStmt {
char *file;
char *map;
char *modifier;
- char *path;
struct _IncludeStmt *next_incl;
} IncludeStmt;