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.

diff --git a/src/frame.c b/src/frame.c
index 22a3996af7f84414ffb9e27746ae84ee3686e248..192ef4244fbe3afde385efeb8d1afb8be30b5eae 100644 (file)
--- 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 dd1d8993f5e7753ee3ed1d188e6d820c941d3465..e521ed12e40a753ffb651a998f8198df52cbe426 100644 (file)
--- 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