[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101090: * keyboard.c (parse_tool_bar
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101090: * keyboard.c (parse_tool_bar_item): Avoid excessive use of strlen. |
Date: |
Sun, 15 Aug 2010 11:30:06 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101090
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sun 2010-08-15 11:30:06 +0200
message:
* keyboard.c (parse_tool_bar_item): Avoid excessive use of strlen.
modified:
src/ChangeLog
src/keyboard.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-08-15 08:13:02 +0000
+++ b/src/ChangeLog 2010-08-15 09:30:06 +0000
@@ -1,3 +1,7 @@
+2010-08-15 Andreas Schwab <address@hidden>
+
+ * keyboard.c (parse_tool_bar_item): Avoid excessive use of strlen.
+
2010-08-15 Jan Djärv <address@hidden>
* keyboard.c (parse_tool_bar_item): malloc buf. Set TOOL_BAR_ITEM_LABEL
=== modified file 'src/keyboard.c'
--- a/src/keyboard.c 2010-08-15 08:13:02 +0000
+++ b/src/keyboard.c 2010-08-15 09:30:06 +0000
@@ -8328,35 +8328,34 @@
Lisp_Object capt = PROP (TOOL_BAR_ITEM_CAPTION);
const char *label = SYMBOLP (key) ? (char *) SDATA (SYMBOL_NAME (key)) :
"";
const char *caption = STRINGP (capt) ? (char *) SDATA (capt) : "";
- EMACS_INT max_lbl = 2*tool_bar_max_label_size;
- char *buf = (char *) xmalloc (max_lbl+1);
+ EMACS_INT max_lbl = 2 * tool_bar_max_label_size;
+ char *buf = (char *) xmalloc (max_lbl + 1);
Lisp_Object new_lbl;
+ size_t caption_len = strlen (caption);
- if (strlen (caption) < max_lbl && caption[0] != '\0')
+ if (caption_len <= max_lbl && caption[0] != '\0')
{
strcpy (buf, caption);
- while (buf[0] != '\0' && buf[strlen (buf) -1] == '.')
- buf[strlen (buf)-1] = '\0';
- if (strlen (buf) <= max_lbl)
- caption = buf;
+ while (caption_len > 0 && buf[caption_len - 1] == '.')
+ caption_len--;
+ buf[caption_len] = '\0';
+ label = caption = buf;
}
- if (strlen (caption) <= max_lbl)
- label = caption;
-
if (strlen (label) <= max_lbl && label[0] != '\0')
{
int i;
- if (label != buf) strcpy (buf, label);
+ if (label != buf)
+ strcpy (buf, label);
- for (i = 0; i < strlen (buf); ++i)
- {
- if (buf[i] == '-') buf[i] = ' ';
- }
+ for (i = 0; buf[i] != '\0'; ++i)
+ if (buf[i] == '-')
+ buf[i] = ' ';
label = buf;
}
- else label = "";
+ else
+ label = "";
new_lbl = Fupcase_initials (make_string (label, strlen (label)));
if (SCHARS (new_lbl) <= tool_bar_max_label_size)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101090: * keyboard.c (parse_tool_bar_item): Avoid excessive use of strlen.,
Andreas Schwab <=