- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
This commit is contained in:
Bernhard Reutner-Fischer
15
editors/vi.c
15
editors/vi.c
@@ -116,7 +116,7 @@ static Byte *status_buffer; // mesages to the user
|
||||
static int have_status_msg; // is default edit status needed?
|
||||
static int last_status_cksum; // hash of current status line
|
||||
static Byte *cfn; // previous, current, and next file name
|
||||
static Byte *text, *end, *textend; // pointers to the user data in memory
|
||||
static Byte *text, *end; // pointers to the user data in memory
|
||||
static Byte *screen; // pointer to the virtual screen buffer
|
||||
static int screensize; // and its size
|
||||
static Byte *screenbegin; // index into text[], of top line on the screen
|
||||
@@ -582,7 +582,7 @@ static void colon(Byte * buf)
|
||||
{
|
||||
Byte c, *orig_buf, *buf1, *q, *r;
|
||||
Byte *fn, cmd[BUFSIZ], args[BUFSIZ];
|
||||
int i, l, li, ch, st, b, e;
|
||||
int i, l, li, ch, b, e;
|
||||
int useforce = FALSE, forced = FALSE;
|
||||
struct stat st_buf;
|
||||
|
||||
@@ -606,7 +606,7 @@ static void colon(Byte * buf)
|
||||
if (*buf == ':')
|
||||
buf++; // move past the ':'
|
||||
|
||||
li = st = ch = i = 0;
|
||||
li = ch = i = 0;
|
||||
b = e = -1;
|
||||
q = text; // assume 1,$ for the range
|
||||
r = end - 1;
|
||||
@@ -1075,14 +1075,13 @@ static void Hit_Return(void)
|
||||
//----- Synchronize the cursor to Dot --------------------------
|
||||
static void sync_cursor(Byte * d, int *row, int *col)
|
||||
{
|
||||
Byte *beg_cur; // begin and end of "d" line
|
||||
Byte *beg_scr, *end_scr; // begin and end of screen
|
||||
Byte *beg_cur; // begin and end of "d" line
|
||||
Byte *end_scr; // begin and end of screen
|
||||
Byte *tp;
|
||||
int cnt, ro, co;
|
||||
|
||||
beg_cur = begin_line(d); // first char of cur line
|
||||
|
||||
beg_scr = end_scr = screenbegin; // first char of screen
|
||||
end_scr = end_screen(); // last char of screen
|
||||
|
||||
if (beg_cur < screenbegin) {
|
||||
@@ -1385,8 +1384,6 @@ static Byte *new_text(int size)
|
||||
text = (Byte *) xmalloc(size + 8);
|
||||
memset(text, '\0', size); // clear new text[]
|
||||
//text += 4; // leave some room for "oops"
|
||||
textend = text + size - 1;
|
||||
//textend -= 4; // leave some root for "oops"
|
||||
return (text);
|
||||
}
|
||||
|
||||
@@ -1963,9 +1960,7 @@ static Byte *text_yank(Byte * p, Byte * q, int dest) // copy text into a registe
|
||||
static Byte what_reg(void)
|
||||
{
|
||||
Byte c;
|
||||
int i;
|
||||
|
||||
i = 0;
|
||||
c = 'D'; // default to D-reg
|
||||
if (0 <= YDreg && YDreg <= 25)
|
||||
c = 'a' + (Byte) YDreg;
|
||||
|
||||
Reference in New Issue
Block a user