[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 32e427c 3/3: Minor doprnt cleanup: remove memchr call
From: |
Paul Eggert |
Subject: |
master 32e427c 3/3: Minor doprnt cleanup: remove memchr call |
Date: |
Sat, 24 Oct 2020 17:00:19 -0400 (EDT) |
branch: master
commit 32e427cca112f5471356c1fa95ba1ed256d200b6
Author: Paul Eggert <eggert@cs.ucla.edu>
Commit: Paul Eggert <eggert@cs.ucla.edu>
Minor doprnt cleanup: remove memchr call
* src/doprnt.c (doprnt): Remove unnecessary call to memchr.
---
src/doprnt.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/doprnt.c b/src/doprnt.c
index be256f4..ce259d0 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -144,10 +144,10 @@ parse_format_integer (char const *fmt, int *value)
return fmt;
}
-/* Like doprnt, except FORMAT must not contain NUL bytes and
- FORMAT_END must be non-null. Although this function is never
- exercised in current Emacs, it is retained in case some future
- Emacs version contains doprnt callers that need such formats.
+/* Like doprnt, except FORMAT_END must be non-null.
+ Although this function is never exercised in current Emacs,
+ it is retained in case some future Emacs version
+ contains doprnt callers that need such formats.
Having a separate function helps GCC optimize doprnt better. */
static ptrdiff_t
doprnt_non_null_end (char *buffer, ptrdiff_t bufsize, char const *format,
@@ -181,7 +181,7 @@ ptrdiff_t
doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
const char *format_end, va_list ap)
{
- if (format_end && !memchr (format, 0, format_end - format))
+ if (format_end)
return doprnt_non_null_end (buffer, bufsize, format, format_end, ap);
const char *fmt = format; /* Pointer into format string. */