procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* dispnew.c (clear_glyph_row, copy_row_except_pointers):

Browse source 
Prefer signed to unsigned integers where either will do.
No need for 'const' on locals that do not escape.
Omit easserts with unnecessary and unportable assumptions about
alignment.  Avoid unnecessary casts to char *.
This commit is contained in:
Paul Eggert 2013-09-24 00:16:38 -07:00
parent d6d9cbc15c
commit 9da0f50e5a
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
2013-09-24 Paul Eggert <eggert@cs.ucla.edu>
* dispnew.c (clear_glyph_row, copy_row_except_pointers):
Prefer signed to unsigned integers where either will do.
No need for 'const' on locals that do not escape.
Omit easserts with unnecessary and unportable assumptions about
alignment. Avoid unnecessary casts to char *.
2013-09-24 Dmitry Antipov <dmantipov@yandex.ru>
Use union for the payload of struct Lisp_Vector.

10
src/dispnew.c
View file

@ -838,11 +838,10 @@ clear_window_matrices (struct window *w, bool desired_p)
void
clear_glyph_row (struct glyph_row *row)
{
const size_t off = offsetof (struct glyph_row, used);
int off = offsetof (struct glyph_row, used);
eassert (off == sizeof row->glyphs);
/* Zero everything except pointers in `glyphs'. */
memset ((char *) row + off, 0, sizeof *row - off);
memset (row->used, 0, sizeof *row - off);
}
@ -989,10 +988,9 @@ swap_glyph_pointers (struct glyph_row *a, struct glyph_row *b)
static void
copy_row_except_pointers (struct glyph_row *to, struct glyph_row *from)
{
const size_t off = offsetof (struct glyph_row, x);
int off = offsetof (struct glyph_row, x);
eassert (off == sizeof to->glyphs + sizeof to->used + sizeof to->hash);
memcpy ((char *) to + off, (char *) from + off, sizeof *to - off);
memcpy (&to->x, &from->x, sizeof *to - off);
}