[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/native-comp 490b8c2: * src/comp.c (fixup_eln_load_path): Simplif
From: |
Eli Zaretskii |
Subject: |
feature/native-comp 490b8c2: * src/comp.c (fixup_eln_load_path): Simplify code. |
Date: |
Sun, 18 Apr 2021 09:45:35 -0400 (EDT) |
branch: feature/native-comp
commit 490b8c2c339966886190fdf897e2d95fb4bb5e3b
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
* src/comp.c (fixup_eln_load_path): Simplify code.
---
src/comp.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/comp.c b/src/comp.c
index 5094731..5309be4 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -4760,14 +4760,12 @@ fixup_eln_load_path (Lisp_Object eln_filename)
if (CONSP (tem))
last_cell = tem;
- const char preloaded[] = "preloaded";
- ptrdiff_t preloaded_len = sizeof (preloaded) - 1;
+ const char preloaded[] = "/preloaded/";
Lisp_Object eln_cache_sys = Ffile_name_directory (eln_filename);
- bool preloaded_p =
- !NILP (Fequal (Fsubstring_no_properties (eln_cache_sys,
- make_fixnum (-preloaded_len - 1),
- make_fixnum (-1)),
- build_string (preloaded)));
+ const char *p_preloaded =
+ SSDATA (eln_cache_sys) + SBYTES (eln_cache_sys) - sizeof (preloaded) + 1;
+ bool preloaded_p = strcmp (p_preloaded, preloaded) == 0;
+
/* One or two directories up... */
for (int i = 0; i < (preloaded_p ? 2 : 1); i++)
eln_cache_sys =
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- feature/native-comp 490b8c2: * src/comp.c (fixup_eln_load_path): Simplify code.,
Eli Zaretskii <=