From e9d4b73cc3ab03c9a2fa40d8a11a2351227ef044 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 22 Jan 2015 18:59:01 +0100 Subject: util/format: move code to is_name_char() --- src/util/format.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/util/format.c b/src/util/format.c index d360df3dc..250bdd7ea 100644 --- a/src/util/format.c +++ b/src/util/format.c @@ -71,6 +71,12 @@ skip_format(const char *p) return p; } +static bool +is_name_char(char ch) +{ + return ch >= 'a' && ch <= 'z'; +} + static char * format_object2(const char *format, const char **last, const void *object, const char *(*getter)(const void *object, const char *name)) @@ -181,7 +187,7 @@ format_object2(const char *format, const char **last, const void *object, /* find the extent of this format specifier (stop at \0, ' ', or esc) */ const char *end = p + 1; - while (*end >= 'a' && *end <= 'z') + while (is_name_char(*end)) ++end; const size_t length = end - p + 1; -- cgit v1.2.3