emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vi: code shrink, proper printf formatting for strlen()

Browse Source 
function                                             old     new   delta
yank_delete                                           98      99      +1
what_reg                                              34      33      -1
text_yank                                             56      54      -2
end_cmd_q                                             17      14      -3
do_cmd                                              4718    4705     -13
colon                                               2875    2861     -14
edit_file                                            668     648     -20
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/6 up/down: 1/-53)             Total: -52 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2019-03-29 14:40:01 +01:00
parent e6f51ac697
commit eabf4b2b57
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editors/vi.c
View File

@ -345,7 +345,8 @@ struct globals {
/* a few references only */ /* a few references only */
#if ENABLE_FEATURE_VI_YANKMARK #if ENABLE_FEATURE_VI_YANKMARK
int YDreg, Ureg; // default delete register and orig line for "U" smalluint YDreg;//,Ureg;// default delete register and orig line for "U"
#define Ureg 27
char *reg[28]; // named register a-z, "D", and "U" 0-25,26,27 char *reg[28]; // named register a-z, "D", and "U" 0-25,26,27
char *mark[28]; // user marks points somewhere in text[]- a-z and previous context '' char *mark[28]; // user marks points somewhere in text[]- a-z and previous context ''
char *context_start, *context_end; char *context_start, *context_end;
@ -455,7 +456,7 @@ struct globals {
#define format_edit_status__tot (G.format_edit_status__tot) #define format_edit_status__tot (G.format_edit_status__tot)
#define YDreg (G.YDreg ) #define YDreg (G.YDreg )
#define Ureg (G.Ureg ) //#define Ureg (G.Ureg )
#define mark (G.mark ) #define mark (G.mark )
#define context_start (G.context_start ) #define context_start (G.context_start )
#define context_end (G.context_end ) #define context_end (G.context_end )
@ -794,7 +795,7 @@ static void edit_file(char *fn)
#if ENABLE_FEATURE_VI_YANKMARK #if ENABLE_FEATURE_VI_YANKMARK
YDreg = 26; // default Yank/Delete reg YDreg = 26; // default Yank/Delete reg
Ureg = 27; // hold orig line for "U" cmd // Ureg = 27; - const // hold orig line for "U" cmd
mark[26] = mark[27] = text; // init "previous context" mark[26] = mark[27] = text; // init "previous context"
#endif #endif
@ -4174,8 +4175,8 @@ static void do_cmd(int c)
if (*p == '\n') if (*p == '\n')
cnt++; cnt++;
} }
status_line("%s %d lines (%d chars) using [%c]", status_line("%s %u lines (%u chars) using [%c]",
buf, cnt, strlen(reg[YDreg]), what_reg()); buf, cnt, (unsigned)strlen(reg[YDreg]), what_reg());
#endif #endif
end_cmd_q(); // stop adding to q end_cmd_q(); // stop adding to q
} }