Commit 3d305bd0cb6bc9f8959e41c161446ab3b691368a
2012-08-30T13:49:23
vmod: remove outdated comments Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88
diff --git a/src/context.c b/src/context.c
index 942fcc2..6c52d37 100644
--- a/src/context.c
+++ b/src/context.c
@@ -201,7 +201,7 @@ default_log_fn(struct xkb_context *ctx, int priority,
const char *prefix = priority_to_prefix(priority);
if (prefix)
- fprintf(stderr, "%-15s", prefix);
+ fprintf(stderr, "%-10s", prefix);
vfprintf(stderr, fmt, args);
}
diff --git a/src/xkbcomp/vmod.c b/src/xkbcomp/vmod.c
index 9ee5d39..5e7ad58 100644
--- a/src/xkbcomp/vmod.c
+++ b/src/xkbcomp/vmod.c
@@ -46,14 +46,6 @@ ClearVModInfo(VModInfo *info)
info->defined = info->available = 0;
}
-/***====================================================================***/
-
-/**
- * Handle one entry in the virtualModifiers line (e.g. NumLock).
- *
- * @param stmt The statement specifying the name
- * @param mergeMode Merge strategy (e.g. MERGE_OVERRIDE)
- */
bool
HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
enum merge_mode mergeMode, VModInfo *info)
@@ -75,7 +67,7 @@ HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
continue;
}
- /* already defined */
+ /* Already defined. */
if (!keymap->vmod_names[i])
continue;
@@ -101,17 +93,6 @@ HandleVModDef(VModDef *stmt, struct xkb_keymap *keymap,
return true;
}
-/**
- * Returns the index of the given modifier in the keymap->vmod_names array.
- *
- * @param keymap Pointer to the xkb data structure.
- * @param field The Atom of the modifier's name (e.g. Atom for LAlt)
- * @param type Must be EXPR_TYPE_INT, otherwise return false.
- * @param val_rtrn Set to the index of the modifier that matches.
- *
- * @return true on success, false otherwise. If false is returned, val_rtrn is
- * undefined.
- */
static bool
LookupVModIndex(const struct xkb_keymap *keymap, xkb_atom_t field,
enum expr_value_type type, xkb_mod_index_t *val_rtrn)
@@ -122,11 +103,6 @@ LookupVModIndex(const struct xkb_keymap *keymap, xkb_atom_t field,
if (type != EXPR_TYPE_INT)
return false;
- /* For each named modifier, get the name and compare it to the one passed
- * in. If we get a match, return the index of the modifier.
- * The order of modifiers is the same as in the virtual_modifiers line in
- * the xkb_types section.
- */
for (i = 0; i < XkbNumVirtualMods; i++) {
if (keymap->vmod_names[i] && streq(keymap->vmod_names[i], name)) {
*val_rtrn = i;
@@ -137,16 +113,6 @@ LookupVModIndex(const struct xkb_keymap *keymap, xkb_atom_t field,
return false;
}
-/**
- * Get the mask for the given (virtual or core) modifier and set
- * val_rtrn.uval to the mask value.
- *
- * @param priv Pointer to xkb data structure.
- * @param val_rtrn Member uval is set to the mask returned.
- *
- * @return true on success, false otherwise. If false is returned, val_rtrn is
- * undefined.
- */
bool
LookupVModMask(struct xkb_context *ctx, const void *priv, xkb_atom_t field,
enum expr_value_type type, xkb_mod_mask_t *val_rtrn)