From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933951AbcLGXyu (ORCPT ); Wed, 7 Dec 2016 18:54:50 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:34646 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932434AbcLGXyr (ORCPT ); Wed, 7 Dec 2016 18:54:47 -0500 Date: Wed, 7 Dec 2016 15:54:45 -0800 From: Guenter Roeck To: Heikki Krogerus Cc: Greg KH , Oliver Neukum , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: Re: [PATCHv13,1/3] lib/string: add sysfs_match_string helper Message-ID: <20161207235445.GA15717@roeck-us.net> References: <20161124122144.26259-2-heikki.krogerus@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161124122144.26259-2-heikki.krogerus@linux.intel.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Nov 24, 2016 at 02:21:42PM +0200, Heikki Krogerus wrote: > Make a simple helper for matching strings with sysfs > attribute files. In most parts the same as match_string(), > except sysfs_match_string() uses sysfs_streq() instead of > strcmp() for matching. This is more convenient when used > with sysfs attributes. > > Signed-off-by: Heikki Krogerus > Reviewed-by: Guenter Roeck > Tested-by: Guenter Roeck > --- > include/linux/string.h | 10 ++++++++++ > lib/string.c | 26 ++++++++++++++++++++++++++ > 2 files changed, 36 insertions(+) > > diff --git a/include/linux/string.h b/include/linux/string.h > index 26b6f6a..c4011b2 100644 > --- a/include/linux/string.h > +++ b/include/linux/string.h > @@ -135,6 +135,16 @@ static inline int strtobool(const char *s, bool *res) > } > > int match_string(const char * const *array, size_t n, const char *string); > +int __sysfs_match_string(const char * const *array, size_t n, const char *s); > + > +/** > + * sysfs_match_string - matches given string in an array > + * @_a: array of strings > + * @_s: string to match with > + * > + * Helper for __sysfs_match_string(). Calculates the size of @a automatically. > + */ > +#define sysfs_match_string(_a, _s) __sysfs_match_string(_a, ARRAY_SIZE(_a), _s) > > #ifdef CONFIG_BINARY_PRINTF > int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args); > diff --git a/lib/string.c b/lib/string.c > index ed83562..c7a20cb 100644 > --- a/lib/string.c > +++ b/lib/string.c > @@ -656,6 +656,32 @@ int match_string(const char * const *array, size_t n, const char *string) > } > EXPORT_SYMBOL(match_string); > > +/** > + * __sysfs_match_string - matches given string in an array > + * @array: array of strings > + * @n: number of strings in the array or -1 for NULL terminated arrays > + * @str: string to match with > + * > + * Returns index of @str in the @array or -EINVAL, just like match_string(). > + * Uses sysfs_streq instead of strcmp for matching. > + */ > +int __sysfs_match_string(const char * const *array, size_t n, const char *str) > +{ > + const char *item; > + int index; > + > + for (index = 0; index < n; index++) { > + item = array[index]; > + if (!item) > + break; > + if (!sysfs_streq(item, str)) No idea how this slipped in: sysfs_streq() returns true on a match, meaning the "!" here is wrong. Guenter > + return index; > + } > + > + return -EINVAL; > +} > +EXPORT_SYMBOL(__sysfs_match_string); > + > #ifndef __HAVE_ARCH_MEMSET > /** > * memset - Fill a region of memory with the given value