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

Clarify intent of FACE_FROM_ID and IMAGE_FROM_ID

Browse source 
* src/dispextern.h (FACE_OPT_FROM_ID): Don’t use FACE_FROM_ID,
since it is intended to be used only when it returns a non-null
pointer, and here the pointer might be null.
(IMAGE_OPT_FROM_ID): Don’t use IMAGE_FROM_ID, for similar reasons.
This commit is contained in:
Paul Eggert 2016-06-24 02:19:13 +02:00
parent 90d0833f24
commit 098347a9b4
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/dispextern.h
View file

@ -1812,7 +1812,7 @@ struct face_cache
bool_bf menu_face_changed_p : 1;
};
/* Return a pointer to the cached face with ID on frame F. */
/* Return a non-null pointer to the cached face with ID on frame F. */
#define FACE_FROM_ID(F, ID) \
(eassert (UNSIGNED_CMP (ID, <, FRAME_FACE_CACHE (F)->used)), \
@ -1823,7 +1823,7 @@ struct face_cache
#define FACE_OPT_FROM_ID(F, ID) \
(UNSIGNED_CMP (ID, <, FRAME_FACE_CACHE (F)->used) \
? FACE_FROM_ID (F, ID) \
? FRAME_FACE_CACHE (F)->faces_by_id[ID] \
: NULL)
/* True if FACE is suitable for displaying ASCII characters. */
@ -3093,7 +3093,7 @@ struct image_cache
};
/* A pointer to the image with id ID on frame F. */
/* A non-null pointer to the image with id ID on frame F. */
#define IMAGE_FROM_ID(F, ID) \
(eassert (UNSIGNED_CMP (ID, <, FRAME_IMAGE_CACHE (F)->used)), \
@ -3104,7 +3104,7 @@ struct image_cache
#define IMAGE_OPT_FROM_ID(F, ID) \
(UNSIGNED_CMP (ID, <, FRAME_IMAGE_CACHE (F)->used) \
? IMAGE_FROM_ID (F, ID) \
? FRAME_IMAGE_CACHE (F)->images[ID] \
: NULL)
/* Size of bucket vector of image caches. Should be prime. */