summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2019-06-20 00:01:06 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2019-06-20 00:41:13 -0700
commit5f32ac13c8b42e2a4eaadea1c4d0888ef341c9cd (patch)
tree8e856fa594bfd7097c1df556f1ff4d4668174d8c
parentfdbbbf94a5ed233571478d94c812644bdfaeb600 (diff)
downloademacs-5f32ac13c8b42e2a4eaadea1c4d0888ef341c9cd.tar.gz
Minor putc tweaks
* src/emacs-module.c (module_abort): * src/xdisp.c (vmessage): Prefer fputc to putc, since speed isn’t crucial here. * src/region-cache.c (pp_cache) [ENABLE_CHECKING]: Simplify.
-rw-r--r--src/emacs-module.c2
-rw-r--r--src/region-cache.c16
-rw-r--r--src/xdisp.c4
3 files changed, 8 insertions, 14 deletions
diff --git a/src/emacs-module.c b/src/emacs-module.c
index 907a5d8225a..c856663d2ff 100644
--- a/src/emacs-module.c
+++ b/src/emacs-module.c
@@ -1304,7 +1304,7 @@ module_abort (const char *format, ...)
va_start (args, format);
vfprintf (stderr, format, args);
va_end (args);
- putc ('\n', stderr);
+ fputc ('\n', stderr);
fflush (NULL);
emacs_abort ();
}
diff --git a/src/region-cache.c b/src/region-cache.c
index d2e3d94829b..57a26f2fa64 100644
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -759,7 +759,6 @@ void pp_cache (struct region_cache *) EXTERNALLY_VISIBLE;
void
pp_cache (struct region_cache *c)
{
- ptrdiff_t i;
ptrdiff_t beg_u = c->buffer_beg + c->beg_unchanged;
ptrdiff_t end_u = c->buffer_end - c->end_unchanged;
@@ -768,19 +767,14 @@ pp_cache (struct region_cache *c)
c->buffer_beg, c->buffer_end,
beg_u, end_u);
- for (i = 0; i < c->cache_len; i++)
+ for (ptrdiff_t i = 0; i < c->cache_len; i++)
{
ptrdiff_t pos = BOUNDARY_POS (c, i);
- putc (((pos < beg_u) ? 'v'
- : (pos == beg_u) ? '-'
- : ' '),
- stderr);
- putc (((pos > end_u) ? '^'
- : (pos == end_u) ? '-'
- : ' '),
- stderr);
- fprintf (stderr, "%"pD"d : %d\n", pos, BOUNDARY_VALUE (c, i));
+ fprintf (stderr, "%c%c%"pD"d : %d\n",
+ pos < beg_u ? 'v' : pos == beg_u ? '-' : ' ',
+ pos > end_u ? '^' : pos == end_u ? '-' : ' ',
+ pos, BOUNDARY_VALUE (c, i));
}
}
diff --git a/src/xdisp.c b/src/xdisp.c
index dc5101d5aca..945174e09c5 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10845,11 +10845,11 @@ vmessage (const char *m, va_list ap)
if (m)
{
if (noninteractive_need_newline)
- putc ('\n', stderr);
+ fputc ('\n', stderr);
noninteractive_need_newline = false;
vfprintf (stderr, m, ap);
if (!cursor_in_echo_area)
- fprintf (stderr, "\n");
+ fputc ('\n', stderr);
fflush (stderr);
}
}