keymap: rename keymap->sym_interpret -> sym_interprets

This can be a bit confusing.

Signed-off-by: Ran Benita <ran234@gmail.com>

diff --git a/src/keymap-dump.c b/src/keymap-dump.c
index fc9b7bfe6658e6192bdccea0fce5fe00ef435660..5ff3b84030591bd3eba85bb566915160fa5685d5 100644 (file)
--- a/src/keymap-dump.c
+++ b/src/keymap-dump.c
@@ -511,7 +511,7 @@ write_compat(struct xkb_keymap *keymap, struct buf *buf)
     write_buf(buf, "\t\tinterpret.useModMapMods= AnyLevel;\n");
     write_buf(buf, "\t\tinterpret.repeat= False;\n");
 
-    darray_foreach(interp, keymap->sym_interpret) {
+    darray_foreach(interp, keymap->sym_interprets) {
         char keysym_name[64];
 
         if (interp->sym == XKB_KEY_NoSymbol)

diff --git a/src/keymap.c b/src/keymap.c
index df215b5ba77a2741db5b5d3ec81a4fb37459dd92..49d7123771c45f614a189392a7c83e11bced4f84 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -106,7 +106,7 @@ xkb_keymap_unref(struct xkb_keymap *keymap)
         free(keymap->types[i].level_names);
     }
     free(keymap->types);
-    darray_free(keymap->sym_interpret);
+    darray_free(keymap->sym_interprets);
     darray_free(keymap->key_aliases);
     darray_free(keymap->group_names);
     darray_free(keymap->mods);

diff --git a/src/keymap.h b/src/keymap.h
index 11fa7438eff4374ca23f554ddd6b78981966e835..f72599e36b3e2d2ad57f5862ed89c485d271728d 100644 (file)
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -390,7 +390,7 @@ struct xkb_keymap {
     struct xkb_key_type *types;
     unsigned int num_types;
 
-    darray(struct xkb_sym_interpret) sym_interpret;
+    darray(struct xkb_sym_interpret) sym_interprets;
 
     darray(struct xkb_mod) mods;
 

diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index 176a4efa4628289a77ebc86f2ad93b345256236d..8edd587fc9fdc945cf6a0f5ea92573058fdb92c3 100644 (file)
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -221,7 +221,7 @@
  * ----------------
  * After all of the xkb_compat sections have been compiled, the following
  * members of struct xkb_keymap are finalized:
- *      darray(struct xkb_sym_interpret) sym_interpret;
+ *      darray(struct xkb_sym_interpret) sym_interprets;
  *      darray(struct xkb_indicator_map) indicators;
  *      char *compat_section_name;
  * TODO: virtual modifiers.
@@ -997,7 +997,7 @@ CopyInterps(CompatInfo *info, bool needSymbol, enum xkb_match_operation pred)
             (!needSymbol && si->interp.sym != XKB_KEY_NoSymbol))
             continue;
 
-        darray_append(info->keymap->sym_interpret, si->interp);
+        darray_append(info->keymap->sym_interprets, si->interp);
     }
 }
 

diff --git a/src/xkbcomp/keymap.c b/src/xkbcomp/keymap.c
index 78ba966b9a7f80e95f8d6ad1822ac6386d1882ef..cd1f79c0ff555ecfa775cf2395368e331ad5e722 100644 (file)
--- a/src/xkbcomp/keymap.c
+++ b/src/xkbcomp/keymap.c
@@ -90,10 +90,10 @@ FindInterpForKey(struct xkb_keymap *keymap, const struct xkb_key *key,
     /*
      * There may be multiple matchings interprets; we should always return
      * the most specific. Here we rely on compat.c to set up the
-     * sym_interpret array from the most specific to the least specific,
+     * sym_interprets array from the most specific to the least specific,
      * such that when we find a match we return immediately.
      */
-    darray_foreach(interp, keymap->sym_interpret) {
+    darray_foreach(interp, keymap->sym_interprets) {
         xkb_mod_mask_t mods;
         bool found;