KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util: drop unused strchr() wrapper 

Suggested-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Eric Engestrom 2018-11-20 11:51:35 +00:00
parent 84e85035cf
commit e7db1806af
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/util/u_debug.c
View File

@ -55,7 +55,7 @@ _debug_vprintf(const char *format, va_list ap)
/* We buffer until we find a newline. */
size_t len = strlen(buf);
int ret = util_vsnprintf(buf + len, sizeof(buf) - len, format, ap);
if (ret > (int)(sizeof(buf) - len - 1) || util_strchr(buf + len, '\n')) {
if (ret > (int)(sizeof(buf) - len - 1) || strchr(buf + len, '\n')) {
os_log_message(buf);
buf[0] = '\0';
}

9
src/util/u_string.h
View File

@ -134,14 +134,6 @@ util_vasprintf(char **ret, const char *format, va_list ap)
return util_vsnprintf(*ret, r + 1, format, ap);
}
static inline char *
util_strchr(const char *s, char c)
{
char *p = util_strchrnul(s, c);
return *p ? p : NULL;
}
static inline char*
util_strncat(char *dst, const char *src, size_t n)
{
@ -200,7 +192,6 @@ util_strncmp(const char *s1, const char *s2, size_t n)
#define util_vsprintf vsprintf
#define util_vasprintf vasprintf
#define util_sprintf sprintf
#define util_strchr strchr
#define util_strcmp strcmp
#define util_strncmp strncmp
#define util_strncat strncat