[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 890440a: Simplify gdk_monitor_get_model string dupl
From: |
Alexander Gramiak |
Subject: |
[Emacs-diffs] master 890440a: Simplify gdk_monitor_get_model string duplication |
Date: |
Sun, 14 Apr 2019 10:56:56 -0400 (EDT) |
branch: master
commit 890440a44cd5f4f09742f521c7783785d114fffc
Author: Alexander Gramiak <address@hidden>
Commit: Alexander Gramiak <address@hidden>
Simplify gdk_monitor_get_model string duplication
* src/xfns.c (x-display-monitor-attributes-list): Use dupstring over
explicit if/xstrdup.
* src/frame.c (free_monitors): Remove redundant check for NULL.
---
src/frame.c | 3 +--
src/xfns.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/frame.c b/src/frame.c
index 22a3996..192ef42 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -5670,8 +5670,7 @@ free_monitors (struct MonitorInfo *monitors, int
n_monitors)
{
int i;
for (i = 0; i < n_monitors; ++i)
- if (monitors[i].name)
- xfree (monitors[i].name);
+ xfree (monitors[i].name);
xfree (monitors);
}
# endif
diff --git a/src/xfns.c b/src/xfns.c
index dd1d899..e521ed1 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5030,8 +5030,7 @@ Internal use only, use `display-monitor-attributes-list'
instead. */)
mi->mm_height = height_mm;
#if GTK_CHECK_VERSION (3, 22, 0)
- if (gdk_monitor_get_model (monitor))
- mi->name = xstrdup (gdk_monitor_get_model (monitor));
+ dupstring (&mi->name, (gdk_monitor_get_model (monitor)));
#elif GTK_CHECK_VERSION (2, 14, 0)
mi->name = gdk_screen_get_monitor_plug_name (gscreen, i);
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 890440a: Simplify gdk_monitor_get_model string duplication,
Alexander Gramiak <=