diff options
| author | Ran Benita <ran234@gmail.com> | 2014-10-18 19:47:19 +0300 |
|---|---|---|
| committer | Ran Benita <ran234@gmail.com> | 2014-10-18 19:47:19 +0300 |
| commit | 4a660d7f86e1b0d488924c1cac7af7dd26618620 (patch) | |
| tree | 7228497d7c176624ee4b014e4adbc8712270e785 /src/xkbcomp/keymap.c | |
| parent | 96a29ede77b0ea622ee268841dc7e41a6634519f (diff) | |
| download | libxkbcommon-4a660d7f86e1b0d488924c1cac7af7dd26618620.tar.gz libxkbcommon-4a660d7f86e1b0d488924c1cac7af7dd26618620.tar.bz2 libxkbcommon-4a660d7f86e1b0d488924c1cac7af7dd26618620.zip | |
xkbcomp: remove file->topName
It is useless.
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src/xkbcomp/keymap.c')
| -rw-r--r-- | src/xkbcomp/keymap.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/xkbcomp/keymap.c b/src/xkbcomp/keymap.c index a7f70cf..45098c2 100644 --- a/src/xkbcomp/keymap.c +++ b/src/xkbcomp/keymap.c @@ -232,13 +232,10 @@ bool CompileKeymap(XkbFile *file, struct xkb_keymap *keymap, enum merge_mode merge) { bool ok; - const char *main_name; XkbFile *files[LAST_KEYMAP_FILE_TYPE + 1] = { NULL }; enum xkb_file_type type; struct xkb_context *ctx = keymap->ctx; - main_name = file->name ? file->name : "(unnamed)"; - /* Collect section files and check for duplicates. */ for (file = (XkbFile *) file->defs; file; file = (XkbFile *) file->common.next) { @@ -257,9 +254,6 @@ CompileKeymap(XkbFile *file, struct xkb_keymap *keymap, enum merge_mode merge) continue; } - if (!file->topName) - file->topName = strdup(main_name); - files[file->file_type] = file; } @@ -285,7 +279,7 @@ CompileKeymap(XkbFile *file, struct xkb_keymap *keymap, enum merge_mode merge) type <= LAST_KEYMAP_FILE_TYPE; type++) { log_dbg(ctx, "Compiling %s \"%s\"\n", - xkb_file_type_to_string(type), files[type]->topName); + xkb_file_type_to_string(type), files[type]->name); ok = compile_file_fns[type](files[type], keymap, merge); if (!ok) { |