gdk: Use G_N_ELEMENTS() when iterating over constant arrays

And do that everywhere.

Because if we don't, we're gonna crash sometimes.

diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c
index a2ad42b5186e35e65a3b0696f434cd65d08435ad..925e5b1fbb2ff632ceb6828471a60a4b04abe8d6 100644 (file)
--- a/gdk/wayland/gdkcursor-wayland.c
+++ b/gdk/wayland/gdkcursor-wayland.c
@@ -99,8 +99,7 @@ static const struct {
   { "nesw-resize",  "fd_double_arrow" },
   { "nwse-resize",  "bd_double_arrow" },
   { "zoom-in",      "left_ptr" },
-  { "zoom-out",     "left_ptr" },
-  { NULL, NULL }
+  { "zoom-out",     "left_ptr" }
 };
 
 static const gchar *
@@ -108,7 +107,7 @@ name_fallback (const gchar *name)
 {
   gint i;
 
-  for (i = 0; name_map[i].css_name; i++)
+  for (i = 0; i < G_N_ELEMENTS (name_map); i++)
     {
       if (g_str_equal (name_map[i].css_name, name))
         return name_map[i].traditional_name;

diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index 90e6020d647f2a1be05076f94bdda8a54e5b855a..38f3dbf925e43de5b47c6b9eb919a74efaca7766 100644 (file)
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -140,8 +140,7 @@ static const struct {
   { "nesw-resize",  "fd_double_arrow",     XC_X_cursor },
   { "nwse-resize",  "bd_double_arrow",     XC_X_cursor },
   { "zoom-in",      "left_ptr",            XC_draped_box },
-  { "zoom-out",     "left_ptr",            XC_draped_box },
-  { NULL, NULL, XC_X_cursor }
+  { "zoom-out",     "left_ptr",            XC_draped_box }
 };
 
 #ifdef HAVE_XCURSOR