[Emacs-diffs] /srv/bzr/emacs/trunk r111595: * nsfont.m (ns_escape_name, ns_unescape_name, ns_registry_to_script):

[Dmitry Antipov]

------------------------------------------------------------
revno: 111595
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Thu 2013-01-24 09:56:31 +0400
message:
  * nsfont.m (ns_escape_name, ns_unescape_name, ns_registry_to_script):
  Avoid redundant calls to strlen.
modified:
  src/ChangeLog
  src/nsfont.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-01-24 05:41:28 +0000
+++ b/src/ChangeLog     2013-01-24 05:56:31 +0000
@@ -1,5 +1,10 @@
 2013-01-24  Dmitry Antipov  <address@hidden>
 
+       * nsfont.m (ns_escape_name, ns_unescape_name, ns_registry_to_script):
+       Avoid redundant calls to strlen.
+
+2013-01-24  Dmitry Antipov  <address@hidden>
+
        Drop async_visible and async_iconified fields of struct frame.
        This is possible because async input is gone; for details, see
        http://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00734.html.

=== modified file 'src/nsfont.m'
--- a/src/nsfont.m      2013-01-13 20:03:01 +0000
+++ b/src/nsfont.m      2013-01-24 05:56:31 +0000
@@ -75,10 +75,9 @@
 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 @@
 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 @@
     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))];