From 31226b9bbeadc32389a2e399f81fd0265ac88a57 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 22 Aug 2021 13:54:04 -0700 Subject: diff: use mempcpy * bootstrap.conf (gnulib_modules): Add mempcpy, stpcpy. * src/ifdef.c (do_printf_spec): * src/sdiff.c (expand_name, lf_snarf, temporary_file): * src/util.c (message5): Prefer mempcpy to memcpy plus manual size-updating. Prefer stpcpy to mempcpy plus manual size-spec. --- src/ifdef.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/ifdef.c') diff --git a/src/ifdef.c b/src/ifdef.c index d82d2d1..b82288f 100644 --- a/src/ifdef.c +++ b/src/ifdef.c @@ -362,9 +362,8 @@ do_printf_spec (FILE *out, char const *spec, size_t spec_prefix_len = f - spec - 2; size_t pI_len = sizeof pI - 1; char *format = xmalloca (spec_prefix_len + pI_len + 2); - char *p = format + spec_prefix_len + pI_len; - memcpy (format, spec, spec_prefix_len); - memcpy (format + spec_prefix_len, pI, pI_len); + char *p = mempcpy (format, spec, spec_prefix_len); + p = stpcpy (p, pI); *p++ = c; *p = '\0'; fprintf (out, format, value); -- cgit v1.2.1