IncludeStmt: Remove useless 'path' member
Signed-off-by: Daniel Stone <daniel@fooishbar.org>master
parent
4bb8b6b1cf
commit
28733c54f9
|
@ -50,7 +50,7 @@ ProcessIncludeFile(struct xkb_context *ctx,
|
||||||
FILE *file;
|
FILE *file;
|
||||||
XkbFile *rtrn, *mapToUse, *next;
|
XkbFile *rtrn, *mapToUse, *next;
|
||||||
|
|
||||||
file = XkbFindFileInPath(ctx, stmt->file, file_type, &stmt->path);
|
file = XkbFindFileInPath(ctx, stmt->file, file_type, NULL);
|
||||||
if (file == NULL) {
|
if (file == NULL) {
|
||||||
log_err(ctx, "Can't find file \"%s\" for %s include\n", stmt->file,
|
log_err(ctx, "Can't find file \"%s\" for %s include\n", stmt->file,
|
||||||
XkbDirectoryForInclude(file_type));
|
XkbDirectoryForInclude(file_type));
|
||||||
|
|
|
@ -419,7 +419,6 @@ IncludeCreate(struct xkb_context *ctx, char *str, enum merge_mode merge)
|
||||||
incl->file = file;
|
incl->file = file;
|
||||||
incl->map = map;
|
incl->map = map;
|
||||||
incl->modifier = extra_data;
|
incl->modifier = extra_data;
|
||||||
incl->path = NULL;
|
|
||||||
incl->next_incl = NULL;
|
incl->next_incl = NULL;
|
||||||
|
|
||||||
if (nextop == '|')
|
if (nextop == '|')
|
||||||
|
@ -569,7 +568,6 @@ FreeInclude(IncludeStmt *incl)
|
||||||
free(incl->file);
|
free(incl->file);
|
||||||
free(incl->map);
|
free(incl->map);
|
||||||
free(incl->modifier);
|
free(incl->modifier);
|
||||||
free(incl->path);
|
|
||||||
free(incl->stmt);
|
free(incl->stmt);
|
||||||
|
|
||||||
free(incl);
|
free(incl);
|
||||||
|
|
|
@ -95,7 +95,6 @@ typedef struct _IncludeStmt {
|
||||||
char *file;
|
char *file;
|
||||||
char *map;
|
char *map;
|
||||||
char *modifier;
|
char *modifier;
|
||||||
char *path;
|
|
||||||
struct _IncludeStmt *next_incl;
|
struct _IncludeStmt *next_incl;
|
||||||
} IncludeStmt;
|
} IncludeStmt;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue