From: Markus Mayer <mmayer@broadcom.com>
To: William Hubbs <w.d.hubbs@gmail.com>,
Chris Brannon <chris@the-brannons.com>,
Kirk Reiser <kirk@reisers.ca>,
Samuel Thibault <samuel.thibault@ens-lyon.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Markus Mayer <mmayer@broadcom.com>,
speakup@linux-speakup.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v5 4/7] staging: speakup: replace spk_strlwr() with strlcpytolower()
Date: Wed, 10 Aug 2016 14:04:54 -0700 [thread overview]
Message-ID: <1470863097-21138-5-git-send-email-mmayer@broadcom.com> (raw)
In-Reply-To: <1470863097-21138-1-git-send-email-mmayer@broadcom.com>
After introducing generic strltolower() and strtolower(), spk_strlwr()
is no longer needed.
Signed-off-by: Markus Mayer <mmayer@broadcom.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Acked-by: Chris Brannon <chris@the-brannons.com>
---
drivers/staging/speakup/kobjects.c | 3 +--
drivers/staging/speakup/main.c | 3 ++-
drivers/staging/speakup/speakup.h | 1 -
drivers/staging/speakup/varhandlers.c | 12 ------------
4 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/speakup/kobjects.c b/drivers/staging/speakup/kobjects.c
index 528cbdc..c6e0c2d 100644
--- a/drivers/staging/speakup/kobjects.c
+++ b/drivers/staging/speakup/kobjects.c
@@ -387,11 +387,10 @@ static ssize_t synth_store(struct kobject *kobj, struct kobj_attribute *attr,
len = strlen(buf);
if (len < 2 || len > 9)
return -EINVAL;
- strncpy(new_synth_name, buf, len);
+ strlcpytolower(new_synth_name, buf, sizeof(new_synth_name));
if (new_synth_name[len - 1] == '\n')
len--;
new_synth_name[len] = '\0';
- spk_strlwr(new_synth_name);
if ((synth != NULL) && (!strcmp(new_synth_name, synth->name))) {
pr_warn("%s already in use\n", new_synth_name);
} else if (synth_init(new_synth_name) != 0) {
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index 97ca4ec..970f568 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -2314,7 +2314,8 @@ static int __init speakup_init(void)
spk_initialize_msgs(); /* Initialize arrays for i18n. */
spk_reset_default_chars();
spk_reset_default_chartab();
- spk_strlwr(synth_name);
+ if (synth_name)
+ strtolower(synth_name);
spk_vars[0].u.n.high = vc->vc_cols;
for (var = spk_vars; var->var_id != MAXVARS; var++)
speakup_register_var(var);
diff --git a/drivers/staging/speakup/speakup.h b/drivers/staging/speakup/speakup.h
index df74c91..4725785 100644
--- a/drivers/staging/speakup/speakup.h
+++ b/drivers/staging/speakup/speakup.h
@@ -50,7 +50,6 @@ void synth_insert_next_index(int sent_num);
void spk_reset_index_count(int sc);
void spk_get_index_count(int *linecount, int *sentcount);
int spk_set_key_info(const u_char *key_info, u_char *k_buffer);
-char *spk_strlwr(char *s);
char *spk_s2uchar(char *start, char *dest);
int speakup_kobj_init(void);
void speakup_kobj_exit(void);
diff --git a/drivers/staging/speakup/varhandlers.c b/drivers/staging/speakup/varhandlers.c
index e1393d2..a1af222 100644
--- a/drivers/staging/speakup/varhandlers.c
+++ b/drivers/staging/speakup/varhandlers.c
@@ -309,18 +309,6 @@ int spk_set_mask_bits(const char *input, const int which, const int how)
return 0;
}
-char *spk_strlwr(char *s)
-{
- char *p;
-
- if (!s)
- return NULL;
-
- for (p = s; *p; p++)
- *p = tolower(*p);
- return s;
-}
-
char *spk_s2uchar(char *start, char *dest)
{
int val;
--
2.7.4
next prev parent reply other threads:[~2016-08-10 21:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-10 21:04 [PATCH v5 0/7] lib: string: add functions to case-convert strings Markus Mayer
2016-08-10 21:04 ` [PATCH v5 1/7] " Markus Mayer
2016-08-10 21:04 ` [PATCH v5 2/7] drm/nouveau/core: make use of new strlcpytolower() function Markus Mayer
2016-08-10 21:04 ` [PATCH v5 3/7] ACPI / device_sysfs: make use of new strtolower() function Markus Mayer
2016-08-10 21:04 ` Markus Mayer [this message]
2016-08-21 15:11 ` [PATCH v5 4/7] staging: speakup: replace spk_strlwr() with strlcpytolower() Greg Kroah-Hartman
2016-08-10 21:04 ` [PATCH v5 5/7] iscsi-target: replace iscsi_initiatorname_tolower() with strtolower() Markus Mayer
2016-08-10 21:04 ` [PATCH v5 6/7] drm/nouveau/fifo/gk104: make use of new strcpytoupper() function Markus Mayer
2016-08-10 21:04 ` [PATCH v5 7/7] power_supply: " Markus Mayer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1470863097-21138-5-git-send-email-mmayer@broadcom.com \
--to=mmayer@broadcom.com \
--cc=chris@the-brannons.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=kirk@reisers.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=samuel.thibault@ens-lyon.org \
--cc=speakup@linux-speakup.org \
--cc=w.d.hubbs@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).