Commit 2bce5643 authored by Dmitry Antipov's avatar Dmitry Antipov
Browse files

Simplify Vobarray checking in oblookup.

* lread.c (oblookup): Simplify Vobarray checking.
parent 4b575b3c
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
* lisp.h (intern, intern_c_string): Redefine as static inline * lisp.h (intern, intern_c_string): Redefine as static inline
wrappers for intern_1 and intern_c_string_1, respectively. wrappers for intern_1 and intern_c_string_1, respectively.
(intern_1, intern_c_string_1): Rename prototypes. (intern_1, intern_c_string_1): Rename prototypes.
* lread.c (intern_1, intern_c_string_1): Simplify Vobarray checking. * lread.c (intern_1, intern_c_string_1, oblookup): Simplify
Vobarray checking.
* font.c (font_intern_prop): Likewise. Adjust comment. * font.c (font_intern_prop): Likewise. Adjust comment.
* w32font.c (intern_font_name): Likewise. * w32font.c (intern_font_name): Likewise.
   
......
...@@ -3835,12 +3835,9 @@ oblookup (Lisp_Object obarray, register const char *ptr, ptrdiff_t size, ptrdiff ...@@ -3835,12 +3835,9 @@ oblookup (Lisp_Object obarray, register const char *ptr, ptrdiff_t size, ptrdiff
register Lisp_Object tail; register Lisp_Object tail;
Lisp_Object bucket, tem; Lisp_Object bucket, tem;
if (!VECTORP (obarray) obarray = check_obarray (obarray);
|| (obsize = ASIZE (obarray)) == 0) obsize = ASIZE (obarray);
{
obarray = check_obarray (obarray);
obsize = ASIZE (obarray);
}
/* This is sometimes needed in the middle of GC. */ /* This is sometimes needed in the middle of GC. */
obsize &= ~ARRAY_MARK_FLAG; obsize &= ~ARRAY_MARK_FLAG;
hash = hash_string (ptr, size_byte) % obsize; hash = hash_string (ptr, size_byte) % obsize;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment