From 890440a44cd5f4f09742f521c7783785d114fffc Mon Sep 17 00:00:00 2001 From: Alexander Gramiak Date: Sun, 14 Apr 2019 08:41:48 -0600 Subject: [PATCH] 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 22a3996af7f..192ef4244fb 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 dd1d8993f5e..e521ed12e40 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 -- 2.39.2