From 806a88c93dc68fe05eeec1a3cd65b58a3cc8de5c Mon Sep 17 00:00:00 2001 From: nirenjan Date: Fri, 3 Apr 2026 23:54:58 -0700 Subject: [PATCH] refactor: Remove vkm_ prefix from VKM source files --- po/POTFILES.in | 2 +- po/libx52.pot | 20 +++++++++---------- po/xx_PL.po | 20 +++++++++---------- vkm/{vkm_common.c => common.c} | 0 vkm/{vkm_linux_evdev.c => linux_evdev.c} | 2 +- ..._linux_evdev_test.c => linux_evdev_test.c} | 2 +- vkm/meson.build | 14 ++++++------- vkm/{vkm_stub.c => stub.c} | 0 8 files changed, 30 insertions(+), 30 deletions(-) rename vkm/{vkm_common.c => common.c} (100%) rename vkm/{vkm_linux_evdev.c => linux_evdev.c} (99%) rename vkm/{vkm_linux_evdev_test.c => linux_evdev_test.c} (99%) rename vkm/{vkm_stub.c => stub.c} (100%) diff --git a/po/POTFILES.in b/po/POTFILES.in index 970f7b7..e49abed 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -4,7 +4,7 @@ libx52/stringify.c libx52io/strings.c -vkm/vkm_common.c +vkm/common.c evtest/ev_test.c diff --git a/po/libx52.pot b/po/libx52.pot index 7d6d15c..79678f0 100644 --- a/po/libx52.pot +++ b/po/libx52.pot @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: libx52/strerror.c:23 libx52io/strings.c:196 vkm/vkm_common.c:25 +#: libx52/strerror.c:23 libx52io/strings.c:196 vkm/common.c:25 msgid "Success" msgstr "" @@ -29,7 +29,7 @@ msgstr "" msgid "Insufficient memory" msgstr "" -#: libx52/strerror.c:26 vkm/vkm_common.c:29 +#: libx52/strerror.c:26 vkm/common.c:29 msgid "Invalid parameter" msgstr "" @@ -85,7 +85,7 @@ msgstr "" msgid "System call interrupted" msgstr "" -#: libx52/strerror.c:66 libx52io/strings.c:220 vkm/vkm_common.c:52 +#: libx52/strerror.c:66 libx52io/strings.c:220 vkm/common.c:52 #, c-format msgid "Unknown error %d" msgstr "" @@ -233,31 +233,31 @@ msgstr "" msgid "Read timeout" msgstr "" -#: vkm/vkm_common.c:26 +#: vkm/common.c:26 msgid "Unknown error" msgstr "" -#: vkm/vkm_common.c:27 +#: vkm/common.c:27 msgid "Not ready" msgstr "" -#: vkm/vkm_common.c:28 +#: vkm/common.c:28 msgid "Out of memory" msgstr "" -#: vkm/vkm_common.c:30 +#: vkm/common.c:30 msgid "Not supported" msgstr "" -#: vkm/vkm_common.c:31 +#: vkm/common.c:31 msgid "Virtual device failure" msgstr "" -#: vkm/vkm_common.c:32 +#: vkm/common.c:32 msgid "Unable to write event" msgstr "" -#: vkm/vkm_common.c:33 +#: vkm/common.c:33 msgid "No state change" msgstr "" diff --git a/po/xx_PL.po b/po/xx_PL.po index 51ba272..420fcd0 100644 --- a/po/xx_PL.po +++ b/po/xx_PL.po @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 3.4.2\n" -#: libx52/strerror.c:23 libx52io/strings.c:196 vkm/vkm_common.c:25 +#: libx52/strerror.c:23 libx52io/strings.c:196 vkm/common.c:25 msgid "Success" msgstr "Uccesssay" @@ -29,7 +29,7 @@ msgstr "Initializationay ailurefay" msgid "Insufficient memory" msgstr "Insufficientay emorymay" -#: libx52/strerror.c:26 vkm/vkm_common.c:29 +#: libx52/strerror.c:26 vkm/common.c:29 msgid "Invalid parameter" msgstr "Invaliday arameterpay" @@ -85,7 +85,7 @@ msgstr "Ipepay erroray" msgid "System call interrupted" msgstr "Ystemsay allcay interrupteday" -#: libx52/strerror.c:66 libx52io/strings.c:220 vkm/vkm_common.c:52 +#: libx52/strerror.c:66 libx52io/strings.c:220 vkm/common.c:52 #, c-format msgid "Unknown error %d" msgstr "Unknownay erroray %d" @@ -233,31 +233,31 @@ msgstr "I/O erroray" msgid "Read timeout" msgstr "Eadray imeouttay" -#: vkm/vkm_common.c:26 +#: vkm/common.c:26 msgid "Unknown error" msgstr "Unknownay erroray" -#: vkm/vkm_common.c:27 +#: vkm/common.c:27 msgid "Not ready" msgstr "Otnay eadyray" -#: vkm/vkm_common.c:28 +#: vkm/common.c:28 msgid "Out of memory" msgstr "Outay ofay emorymay" -#: vkm/vkm_common.c:30 +#: vkm/common.c:30 msgid "Not supported" msgstr "Otnay upportedsay" -#: vkm/vkm_common.c:31 +#: vkm/common.c:31 msgid "Virtual device failure" msgstr "Irtualvay eviceday ailurefay" -#: vkm/vkm_common.c:32 +#: vkm/common.c:32 msgid "Unable to write event" msgstr "Unableay otay itewray eventay" -#: vkm/vkm_common.c:33 +#: vkm/common.c:33 msgid "No state change" msgstr "Onay atestay angechay" diff --git a/vkm/vkm_common.c b/vkm/common.c similarity index 100% rename from vkm/vkm_common.c rename to vkm/common.c diff --git a/vkm/vkm_linux_evdev.c b/vkm/linux_evdev.c similarity index 99% rename from vkm/vkm_linux_evdev.c rename to vkm/linux_evdev.c index cb37c92..6c73ef8 100644 --- a/vkm/vkm_linux_evdev.c +++ b/vkm/linux_evdev.c @@ -25,7 +25,7 @@ static const int vkm_key_to_evdev[VKM_KEY_MAX] = { #if defined(__GNUC__) || defined(__clang__) [0 ...(VKM_KEY_MAX - 1)] = -1, #else -#error "vkm_linux_evdev.c requires GCC or Clang (sparse vkm_key_to_evdev initializer)" +#error "linux_evdev.c requires GCC or Clang (sparse vkm_key_to_evdev initializer)" #endif [VKM_KEY_NONE] = -1, diff --git a/vkm/vkm_linux_evdev_test.c b/vkm/linux_evdev_test.c similarity index 99% rename from vkm/vkm_linux_evdev_test.c rename to vkm/linux_evdev_test.c index 7f2371b..0c196af 100644 --- a/vkm/vkm_linux_evdev_test.c +++ b/vkm/linux_evdev_test.c @@ -163,7 +163,7 @@ static void expect_enable_mouse_events(bool hi_res, bool horiz) #undef EXPECT_KEY_CODE } -/** Same order as \c enable_keyboard_events() in \c vkm_linux_evdev.c (skip unmapped indices). */ +/** Same order as \c enable_keyboard_events() in \c linux_evdev.c (skip unmapped indices). */ static const unsigned int expect_kb_codes[] = { KEY_A, KEY_B, KEY_C, KEY_D, KEY_E, KEY_F, KEY_G, KEY_H, KEY_I, KEY_J, KEY_K, KEY_L, KEY_M, KEY_N, KEY_O, KEY_P, KEY_Q, KEY_R, KEY_S, KEY_T, KEY_U, KEY_V, KEY_W, KEY_X, KEY_Y, KEY_Z, diff --git a/vkm/meson.build b/vkm/meson.build index da5bf13..ee5623d 100644 --- a/vkm/meson.build +++ b/vkm/meson.build @@ -1,18 +1,18 @@ vkm_version = '0.1.0' vkm_files = files( - 'vkm_common.c' + 'common.c' ) vkm_stub_files = files( - 'vkm_stub.c' + 'stub.c' ) if host_machine.system() == 'linux' vkm_dep = dep_evdev if dep_evdev.found() vkm_platform_files = files( - 'vkm_linux_evdev.c' + 'linux_evdev.c' ) else vkm_platform_files = vkm_stub_files @@ -31,7 +31,7 @@ lib_vkm = library('vkm', vkm_files + vkm_platform_files, vkm_strerror_test = executable('vkm-strerror-test', 'test_strerror.c', - 'vkm_common.c', + 'common.c', build_by_default: false, dependencies: [dep_cmocka, dep_intl], include_directories: [includes], @@ -43,9 +43,9 @@ if host_machine.system() == 'linux' and dep_evdev.found() dep_evdev_headers = dep_evdev.partial_dependency(compile_args: true, link_args: false) vkm_linux_evdev_test = executable('vkm_linux_evdev_test', files( - 'vkm_linux_evdev_test.c', - 'vkm_linux_evdev.c', - 'vkm_common.c', + 'linux_evdev_test.c', + 'linux_evdev.c', + 'common.c', ), include_directories: [includes], dependencies: [dep_cmocka, dep_evdev_headers, dep_intl], diff --git a/vkm/vkm_stub.c b/vkm/stub.c similarity index 100% rename from vkm/vkm_stub.c rename to vkm/stub.c