ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: reshuffle three statements, and shorten a comment

master
Benno Schulenberg 2017-02-25 11:47:21 +01:00
parent 2bbb6cfeb5
commit e5731fe198
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/text.c
View File

@ -1632,8 +1632,6 @@ ssize_t break_line(const char *line, ssize_t goal, bool snap_at_nl)
/* Find the last blank that does not overshoot the target column. */ /* Find the last blank that does not overshoot the target column. */
while (*line != '\0' && column <= goal) { while (*line != '\0' && column <= goal) {
char_len = parse_mbchar(line, NULL, &column);
if (is_blank_mbchar(line) || (snap_at_nl && *line == '\n')) { if (is_blank_mbchar(line) || (snap_at_nl && *line == '\n')) {
lastblank = index; lastblank = index;
@ -1641,6 +1639,7 @@ ssize_t break_line(const char *line, ssize_t goal, bool snap_at_nl)
break; break;
} }
char_len = parse_mbchar(line, NULL, &column);
line += char_len; line += char_len;
index += char_len; index += char_len;
} }
@ -1656,17 +1655,15 @@ ssize_t break_line(const char *line, ssize_t goal, bool snap_at_nl)
return (index - char_len); return (index - char_len);
#endif #endif
/* If no blank was found within the goal width, try to find a /* If no blank was found within the goal width, seek one after it. */
* blank beyond it. */
if (lastblank < 0) { if (lastblank < 0) {
while (*line != '\0') { while (*line != '\0') {
char_len = parse_mbchar(line, NULL, NULL);
if (is_blank_mbchar(line)) if (is_blank_mbchar(line))
lastblank = index; lastblank = index;
else if (lastblank > 0) else if (lastblank > 0)
return lastblank; return lastblank;
char_len = parse_mbchar(line, NULL, NULL);
line += char_len; line += char_len;
index += char_len; index += char_len;
} }
@ -1675,7 +1672,7 @@ ssize_t break_line(const char *line, ssize_t goal, bool snap_at_nl)
} }
/* Move the pointer back to the last blank, and then step beyond it. */ /* Move the pointer back to the last blank, and then step beyond it. */
line += lastblank - index; line = line - index + lastblank;
char_len = parse_mbchar(line, NULL, NULL); char_len = parse_mbchar(line, NULL, NULL);
line += char_len; line += char_len;