[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master f9775f2: Prefer xlispstrdup to avoid dumb calls to
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] master f9775f2: Prefer xlispstrdup to avoid dumb calls to strlen |
Date: |
Tue, 20 Jan 2015 10:30:40 +0000 |
branch: master
commit f9775f21fcddd3d3715cb3249090d99322488a45
Author: Dmitry Antipov <address@hidden>
Commit: Dmitry Antipov <address@hidden>
Prefer xlispstrdup to avoid dumb calls to strlen
* nsfont.m (ns_get_family):
* nsterm.m (ns_term_init):
* w32fns.c (w32_window):
* xfns.c (x_window, Fx_select_font): Use xlispstrdup.
---
src/ChangeLog | 8 ++++++++
src/nsfont.m | 2 +-
src/nsterm.m | 2 +-
src/w32fns.c | 2 +-
src/xfns.c | 6 +++---
5 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index b8528c2..6257cc4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2015-01-20 Dmitry Antipov <address@hidden>
+
+ Prefer xlispstrdup to avoid dumb calls to strlen.
+ * nsfont.m (ns_get_family):
+ * nsterm.m (ns_term_init):
+ * w32fns.c (w32_window):
+ * xfns.c (x_window, Fx_select_font): Use xlispstrdup.
+
2015-01-20 Paul Eggert <address@hidden>
Correct an old fix for GTK font selection
diff --git a/src/nsfont.m b/src/nsfont.m
index f5e89d3..683ab17 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -93,7 +93,7 @@ ns_get_family (Lisp_Object font_spec)
return nil;
else
{
- char *tmp = xstrdup (SSDATA (SYMBOL_NAME (tem)));
+ char *tmp = xlispstrdup (SYMBOL_NAME (tem));
NSString *family;
ns_unescape_name (tmp);
family = [NSString stringWithUTF8String: tmp];
diff --git a/src/nsterm.m b/src/nsterm.m
index bf3192b..b07fa1c 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4313,7 +4313,7 @@ ns_term_init (Lisp_Object display_name)
dpyinfo->name_list_element = Fcons (display_name, Qnil);
- terminal->name = xstrdup (SSDATA (display_name));
+ terminal->name = xlispstrdup (display_name);
unblock_input ();
diff --git a/src/w32fns.c b/src/w32fns.c
index 2dd92ff..55e5829 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4208,7 +4208,7 @@ w32_window (struct frame *f, long window_prompting, int
minibuffer_only)
for the window manager, so GC relocation won't bother it.
Elsewhere we specify the window name for the window manager. */
- f->namebuf = xstrdup (SSDATA (Vx_resource_name));
+ f->namebuf = xlispstrdup (Vx_resource_name);
my_create_window (f);
diff --git a/src/xfns.c b/src/xfns.c
index 936c769..a09e4a6 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2238,7 +2238,7 @@ x_window (struct frame *f, long window_prompting, int
minibuffer_only)
for the window manager, so GC relocation won't bother it.
Elsewhere we specify the window name for the window manager. */
- f->namebuf = xstrdup (SSDATA (Vx_resource_name));
+ f->namebuf = xlispstrdup (Vx_resource_name);
ac = 0;
XtSetArg (al[ac], XtNallowShellResize, 1); ac++;
@@ -5995,12 +5995,12 @@ nil, it defaults to the selected frame. */)
XSETFONT (font, FRAME_FONT (f));
font_param = Ffont_get (font, intern (":name"));
if (STRINGP (font_param))
- default_name = xstrdup (SSDATA (font_param));
+ default_name = xlispstrdup (font_param);
else
{
font_param = Fframe_parameter (frame, Qfont_param);
if (STRINGP (font_param))
- default_name = xstrdup (SSDATA (font_param));
+ default_name = xlispstrdup (font_param);
}
font = xg_get_font (f, default_name);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master f9775f2: Prefer xlispstrdup to avoid dumb calls to strlen,
Dmitry Antipov <=