From fd3ceb099904ef08ba59ca78c6e501e2cf05125d Mon Sep 17 00:00:00 2001
From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Thu, 24 Jan 2013 09:56:31 +0400
Subject: [PATCH] * nsfont.m (ns_escape_name, ns_unescape_name,
 ns_registry_to_script): Avoid redundant calls to strlen.

---
 src/ChangeLog |  5 +++++
 src/nsfont.m  | 16 +++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index e89196a15c5..ffa4bdf927f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-24  Dmitry Antipov  <dmantipov@yandex.ru>
+
+	* nsfont.m (ns_escape_name, ns_unescape_name, ns_registry_to_script):
+	Avoid redundant calls to strlen.
+
 2013-01-24  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	Drop async_visible and async_iconified fields of struct frame.
diff --git a/src/nsfont.m b/src/nsfont.m
index 5039f0c9013..ebee363651f 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -75,10 +75,9 @@ static void ns_glyph_metrics (struct nsfont_info *font_info,
 static void
 ns_escape_name (char *name)
 {
-  int i =0, len =strlen (name);
-  for ( ; i<len; i++)
-    if (name[i] == ' ')
-      name[i] = '_';
+  for (; *name; name++)
+    if (*name == ' ')
+      *name = '_';
 }
 
 
@@ -86,10 +85,9 @@ ns_escape_name (char *name)
 static void
 ns_unescape_name (char *name)
 {
-  int i =0, len =strlen (name);
-  for ( ; i<len; i++)
-    if (name[i] == '_')
-      name[i] = ' ';
+  for (; *name; name++)
+    if (*name == '_')
+      *name = ' ';
 }
 
 
@@ -364,7 +362,7 @@ static NSString
     while CONSP (rts)
       {
         r = XCAR (XCAR (rts));
-        if (!strncmp(SSDATA(r), reg, strlen(SSDATA(r))))
+        if (!strncmp (SSDATA (r), reg, SBYTES (r)))
           {
             script = XCDR (XCAR (rts));
             return [NSString stringWithUTF8String: SSDATA (SYMBOL_NAME (script))];
-- 
2.39.2