* [PATCH] rfkill: expand all acronyms in type string descriptions
@ 2017-10-14 21:35 Sami Kerola
2017-10-16 8:58 ` Karel Zak
0 siblings, 1 reply; 4+ messages in thread
From: Sami Kerola @ 2017-10-14 21:35 UTC (permalink / raw)
To: util-linux; +Cc: Sami Kerola
Be as verbose as possible when user wants that. This also fixes small typo
from 7d2a9960ad that made gps to look like a GUID Partition Table.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
sys-utils/rfkill.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys-utils/rfkill.c b/sys-utils/rfkill.c
index 195386c8f..2b667f7c7 100644
--- a/sys-utils/rfkill.c
+++ b/sys-utils/rfkill.c
@@ -57,16 +57,16 @@ struct rfkill_type_str {
static const struct rfkill_type_str rfkill_type_strings[] = {
{ .type = RFKILL_TYPE_ALL, .name = "all" },
- { .type = RFKILL_TYPE_WLAN, .name = "wlan", .desc = "Wireless LAN" },
+ { .type = RFKILL_TYPE_WLAN, .name = "wlan", .desc = "Wireless Local Area Network" },
{ .type = RFKILL_TYPE_WLAN, .name = "wifi" }, /* alias */
{ .type = RFKILL_TYPE_BLUETOOTH, .name = "bluetooth", .desc = "Bluetooth" },
{ .type = RFKILL_TYPE_UWB, .name = "uwb", .desc = "Ultra-Wideband" },
{ .type = RFKILL_TYPE_UWB, .name = "ultrawideband" }, /* alias */
- { .type = RFKILL_TYPE_WIMAX, .name = "wimax", .desc = "WiMAX" },
- { .type = RFKILL_TYPE_WWAN, .name = "wwan", .desc = "Wireless WAN" },
- { .type = RFKILL_TYPE_GPS, .name = "gps", .desc = "GPT" },
- { .type = RFKILL_TYPE_FM, .name = "fm", .desc = "FM" },
- { .type = RFKILL_TYPE_NFC, .name = "nfc", .desc = "NFC" },
+ { .type = RFKILL_TYPE_WIMAX, .name = "wimax", .desc = "Worldwide Interoperability for Microwave Access" },
+ { .type = RFKILL_TYPE_WWAN, .name = "wwan", .desc = "Wireless Wide Area Network" },
+ { .type = RFKILL_TYPE_GPS, .name = "gps", .desc = "Global Positioning System" },
+ { .type = RFKILL_TYPE_FM, .name = "fm", .desc = "Frequency Modulation radio" },
+ { .type = RFKILL_TYPE_NFC, .name = "nfc", .desc = "Near-Field Communication" },
{ .type = NUM_RFKILL_TYPES, .name = NULL }
};
--
2.14.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] rfkill: expand all acronyms in type string descriptions
2017-10-14 21:35 [PATCH] rfkill: expand all acronyms in type string descriptions Sami Kerola
@ 2017-10-16 8:58 ` Karel Zak
2017-10-16 18:15 ` Sami Kerola
0 siblings, 1 reply; 4+ messages in thread
From: Karel Zak @ 2017-10-16 8:58 UTC (permalink / raw)
To: Sami Kerola; +Cc: util-linux
On Sat, Oct 14, 2017 at 10:35:41PM +0100, Sami Kerola wrote:
> Be as verbose as possible when user wants that. This also fixes small typo
> from 7d2a9960ad that made gps to look like a GUID Partition Table.
>
> Signed-off-by: Sami Kerola <kerolasa@iki.fi>
> ---
> sys-utils/rfkill.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/sys-utils/rfkill.c b/sys-utils/rfkill.c
> index 195386c8f..2b667f7c7 100644
> --- a/sys-utils/rfkill.c
> +++ b/sys-utils/rfkill.c
> @@ -57,16 +57,16 @@ struct rfkill_type_str {
>
> static const struct rfkill_type_str rfkill_type_strings[] = {
> { .type = RFKILL_TYPE_ALL, .name = "all" },
> - { .type = RFKILL_TYPE_WLAN, .name = "wlan", .desc = "Wireless LAN" },
> + { .type = RFKILL_TYPE_WLAN, .name = "wlan", .desc = "Wireless Local Area Network" },
> { .type = RFKILL_TYPE_WLAN, .name = "wifi" }, /* alias */
> { .type = RFKILL_TYPE_BLUETOOTH, .name = "bluetooth", .desc = "Bluetooth" },
> { .type = RFKILL_TYPE_UWB, .name = "uwb", .desc = "Ultra-Wideband" },
> { .type = RFKILL_TYPE_UWB, .name = "ultrawideband" }, /* alias */
> - { .type = RFKILL_TYPE_WIMAX, .name = "wimax", .desc = "WiMAX" },
> - { .type = RFKILL_TYPE_WWAN, .name = "wwan", .desc = "Wireless WAN" },
> - { .type = RFKILL_TYPE_GPS, .name = "gps", .desc = "GPT" },
> - { .type = RFKILL_TYPE_FM, .name = "fm", .desc = "FM" },
> - { .type = RFKILL_TYPE_NFC, .name = "nfc", .desc = "NFC" },
> + { .type = RFKILL_TYPE_WIMAX, .name = "wimax", .desc = "Worldwide Interoperability for Microwave Access" },
> + { .type = RFKILL_TYPE_WWAN, .name = "wwan", .desc = "Wireless Wide Area Network" },
> + { .type = RFKILL_TYPE_GPS, .name = "gps", .desc = "Global Positioning System" },
> + { .type = RFKILL_TYPE_FM, .name = "fm", .desc = "Frequency Modulation radio" },
> + { .type = RFKILL_TYPE_NFC, .name = "nfc", .desc = "Near-Field Communication" },
> { .type = NUM_RFKILL_TYPES, .name = NULL }
> };
So, the default "list" output will be *again* backwardly incompatible :-)
Karel
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] rfkill: expand all acronyms in type string descriptions
2017-10-16 8:58 ` Karel Zak
@ 2017-10-16 18:15 ` Sami Kerola
2017-10-17 8:16 ` Karel Zak
0 siblings, 1 reply; 4+ messages in thread
From: Sami Kerola @ 2017-10-16 18:15 UTC (permalink / raw)
To: Karel Zak; +Cc: util-linux
On Mon, 16 Oct 2017, Karel Zak wrote:
> So, the default "list" output will be *again* backwardly incompatible :-)
Yep, that would not be good. I should have looked a little bit close what
was done with these descriptiosn. Anyway, lets get the s/GPT/GPS/ fixed.
--->8----
>From 4a74c9b1675f4c4f2ff6ce69bdb5808da9c258af Mon Sep 17 00:00:00 2001
From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 14 Oct 2017 22:18:21 +0100
Subject: [PATCH] rfkill: fix description name typo
Commit 7d2a9960ad made gps to look like a GUID Partition Table.
Reviewed-by: Karel Zak <kzak@redhat.com>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
sys-utils/rfkill.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-utils/rfkill.c b/sys-utils/rfkill.c
index 013806020..c31da7997 100644
--- a/sys-utils/rfkill.c
+++ b/sys-utils/rfkill.c
@@ -64,7 +64,7 @@ static const struct rfkill_type_str rfkill_type_strings[] = {
{ .type = RFKILL_TYPE_UWB, .name = "ultrawideband" }, /* alias */
{ .type = RFKILL_TYPE_WIMAX, .name = "wimax", .desc = "WiMAX" },
{ .type = RFKILL_TYPE_WWAN, .name = "wwan", .desc = "Wireless WAN" },
- { .type = RFKILL_TYPE_GPS, .name = "gps", .desc = "GPT" },
+ { .type = RFKILL_TYPE_GPS, .name = "gps", .desc = "GPS" },
{ .type = RFKILL_TYPE_FM, .name = "fm", .desc = "FM" },
{ .type = RFKILL_TYPE_NFC, .name = "nfc", .desc = "NFC" },
{ .type = NUM_RFKILL_TYPES, .name = NULL }
--
2.14.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-10-17 8:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-14 21:35 [PATCH] rfkill: expand all acronyms in type string descriptions Sami Kerola
2017-10-16 8:58 ` Karel Zak
2017-10-16 18:15 ` Sami Kerola
2017-10-17 8:16 ` Karel Zak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).