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

ast: remove unneeded 'ctx' param to XkbFileCreate 

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2014-02-09 23:21:19 +02:00
parent 8be2608a26
commit 16aab829bb
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/xkbcomp/ast-build.c
View File

@ -496,8 +496,8 @@ err:
}
XkbFile *
XkbFileCreate(struct xkb_context *ctx, enum xkb_file_type type, char *name,
ParseCommon *defs, enum xkb_map_flags flags)
XkbFileCreate(enum xkb_file_type type, char *name, ParseCommon *defs,
enum xkb_map_flags flags)
{
XkbFile *file;
@ -533,7 +533,7 @@ XkbFileFromComponents(struct xkb_context *ctx,
if (!include)
goto err;
file = XkbFileCreate(ctx, type, NULL, &include->common, 0);
file = XkbFileCreate(type, NULL, &include->common, 0);
if (!file) {
FreeInclude(include);
goto err;
@ -542,7 +542,7 @@ XkbFileFromComponents(struct xkb_context *ctx,
defs = AppendStmt(defs, &file->common);
}
file = XkbFileCreate(ctx, FILE_TYPE_KEYMAP, NULL, defs, 0);
file = XkbFileCreate(FILE_TYPE_KEYMAP, NULL, defs, 0);
if (!file)
goto err;

4
src/xkbcomp/ast-build.h
View File

@ -113,8 +113,8 @@ IncludeStmt *
IncludeCreate(struct xkb_context *ctx, char *str, enum merge_mode merge);
XkbFile *
XkbFileCreate(struct xkb_context *ctx, enum xkb_file_type type, char *name,
ParseCommon *defs, enum xkb_map_flags flags);
XkbFileCreate(enum xkb_file_type type, char *name, ParseCommon *defs,
enum xkb_map_flags flags);
void
FreeStmt(ParseCommon *stmt);

4
src/xkbcomp/parser.y
View File

@ -246,7 +246,7 @@ XkbFile : XkbCompositeMap
XkbCompositeMap : OptFlags XkbCompositeType OptMapName OBRACE
XkbMapConfigList
CBRACE SEMI
{ $$ = XkbFileCreate(param->ctx, $2, $3, &$5->common, $1); }
{ $$ = XkbFileCreate($2, $3, &$5->common, $1); }
;
XkbCompositeType: XKB_KEYMAP { $$ = FILE_TYPE_KEYMAP; }
@ -275,7 +275,7 @@ XkbMapConfig : OptFlags FileType OptMapName OBRACE
$$ = NULL;
}
else {
$$ = XkbFileCreate(param->ctx, $2, $3, $5, $1);
$$ = XkbFileCreate($2, $3, $5, $1);
}
}
;