IncludeStmt: Remove useless 'path' member

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

diff --git a/src/xkbcomp/misc.c b/src/xkbcomp/misc.c
index 4db4ac25ffd19298060065678b1d1367b596bfc8..a80502dc0a0f081fc7373d1fa3d9e6315ca74ec7 100644 (file)
--- 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 89b7e8d5cdee75516d824998af64e3e7da2f3f96..fb6271de4d6f3d8d17c540560a23d877ec394b6c 100644 (file)
--- 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 6774c7a30b3226e932cd8b0f0ab5fd9caa37dd63..67744ef20b426b86d67e6ab358a6530bb7c78854 100644 (file)
--- 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;