* keyboard.c (parse_tool_bar_item): Avoid need for strlen.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4928e2093641f1badfb7456b7b63c16cf573d0ad..b1035da6c7b89f49d33cd9e73153993565eaeac4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,7 @@
        * image.c (xpm_scan) [HAVE_NS && !HAVE_XPM]:
        Don't assume string length fits in int.
 
+       * keyboard.c (parse_tool_bar_item):
        * gtkutil.c (style_changed_cb): Avoid need for strlen.
 
        * font.c: Don't assume string length fits in int.

diff --git a/src/keyboard.c b/src/keyboard.c
index e7a0598e83992ddd383ac1452834a5b5428c1d65..bffe2b035dcb65be5dd7542c3047bf1ab1dc505c 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8225,7 +8225,7 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item)
           /* `:label LABEL-STRING'.  */
           PROP (TOOL_BAR_ITEM_LABEL) = STRINGP (value)
             ? value
-            : make_string (bad_label, strlen (bad_label));
+            : build_string (bad_label);
           have_label = 1;
         }
       else if (EQ (ikey, QCfilter))
@@ -8291,7 +8291,7 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item)
       else
        label = "";
 
-      new_lbl = Fupcase_initials (make_string (label, strlen (label)));
+      new_lbl = Fupcase_initials (build_string (label));
       if (SCHARS (new_lbl) <= tool_bar_max_label_size)
         PROP (TOOL_BAR_ITEM_LABEL) = new_lbl;
       else