aboutsummaryrefslogtreecommitdiff
path: root/miscutils/less.c
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-08-20 17:35:13 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-08-20 17:35:13 +0000
commitd591a360d39f9bca3479b913fe4c5773965d18cf (patch)
tree994b43e608bc4640dff7d1bd333938229b874d82 /miscutils/less.c
parent13068a4fdbe558daea85820fec663db3536aacff (diff)
downloadbusybox-w32-d591a360d39f9bca3479b913fe4c5773965d18cf.tar.gz
busybox-w32-d591a360d39f9bca3479b913fe4c5773965d18cf.tar.bz2
busybox-w32-d591a360d39f9bca3479b913fe4c5773965d18cf.zip
- 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
Diffstat (limited to 'miscutils/less.c')
-rw-r--r--miscutils/less.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/miscutils/less.c b/miscutils/less.c
index 9dd9b9e56..c13d7b8a2 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -872,14 +872,12 @@ static void save_input_to_file(void)
872static void add_mark(void) 872static void add_mark(void)
873{ 873{
874 int letter; 874 int letter;
875 int mark_line;
876 875
877 clear_line(); 876 clear_line();
878 printf("Mark: "); 877 printf("Mark: ");
879 letter = tless_getch(); 878 letter = tless_getch();
880 879
881 if (isalpha(letter)) { 880 if (isalpha(letter)) {
882 mark_line = line_pos;
883 881
884 /* If we exceed 15 marks, start overwriting previous ones */ 882 /* If we exceed 15 marks, start overwriting previous ones */
885 if (num_marks == 14) 883 if (num_marks == 14)
@@ -927,19 +925,14 @@ static char opp_bracket(char bracket)
927 switch (bracket) { 925 switch (bracket) {
928 case '{': case '[': 926 case '{': case '[':
929 return bracket + 2; 927 return bracket + 2;
930 break;
931 case '(': 928 case '(':
932 return ')'; 929 return ')';
933 break;
934 case '}': case ']': 930 case '}': case ']':
935 return bracket - 2; 931 return bracket - 2;
936 break;
937 case ')': 932 case ')':
938 return '('; 933 return '(';
939 break;
940 default: 934 default:
941 return 0; 935 return 0;
942 break;
943 } 936 }
944} 937}
945 938
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 20:49:34 +0000