StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IncludeStmt: Remove useless 'path' member 

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
master
Daniel Stone 2012-08-03 05:34:58 +02:00
parent 4bb8b6b1cf
commit 28733c54f9
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xkbcomp/misc.c
View File

@ -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));

2
src/xkbcomp/parseutils.c
View File

@ -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);

1
src/xkbcomp/xkbcomp.h
View File

@ -95,7 +95,6 @@ typedef struct _IncludeStmt {
char *file;
char *map;
char *modifier;
char *path;
struct _IncludeStmt *next_incl;
} IncludeStmt;