diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-21 23:05:26 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-21 23:05:26 +0000 |
commit | 5415c856eaccd1bc5d064022770a288f43b2e94f (patch) | |
tree | 5973db4e6f81b5e311e8944700ded5db1083d440 /procps/sysctl.c | |
parent | b74a2dba571d1c5a6127c683fb50923336d9c59f (diff) | |
download | busybox-w32-5415c856eaccd1bc5d064022770a288f43b2e94f.tar.gz busybox-w32-5415c856eaccd1bc5d064022770a288f43b2e94f.tar.bz2 busybox-w32-5415c856eaccd1bc5d064022770a288f43b2e94f.zip |
libbb: [x]fopen_for_{read,write} introduced and used.
(by Valdimir)
function old new delta
config_open2 - 41 +41
config_read 507 542 +35
find_pair 169 187 +18
fopen_for_write - 14 +14
fopen_for_read - 14 +14
find_main 406 418 +12
xfopen_for_write - 10 +10
xfopen_for_read - 10 +10
popstring 134 140 +6
parse_inittab 396 401 +5
next_token 923 928 +5
pack_gzip 1659 1661 +2
bb__parsespent 117 119 +2
fallbackSort 1719 1717 -2
evalvar 1376 1374 -2
qrealloc 36 33 -3
...
...
...
...
singlemount 4579 4569 -10
process_stdin 443 433 -10
patch_main 1111 1101 -10
ifupdown_main 2175 2165 -10
file_action_grep 90 80 -10
uuidcache_init 649 637 -12
hush_main 797 785 -12
read_config 230 217 -13
dpkg_main 3835 3820 -15
read_line_input 3134 3110 -24
sysctl_main 232 203 -29
config_open 40 10 -30
WARN_BAD_LINE 44 - -44
login_main 1714 1575 -139
------------------------------------------------------------------------------
(add/remove: 5/1 grow/shrink: 8/74 up/down: 174/-737) Total: -563 bytes
Diffstat (limited to 'procps/sysctl.c')
-rw-r--r-- | procps/sysctl.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/procps/sysctl.c b/procps/sysctl.c index 6e582b0f9..3fe6f6f3e 100644 --- a/procps/sysctl.c +++ b/procps/sysctl.c | |||
@@ -98,10 +98,11 @@ static int sysctl_preload_file_and_exit(const char *filename) | |||
98 | if (!parser) | 98 | if (!parser) |
99 | return 1; | 99 | return 1; |
100 | 100 | ||
101 | while (config_read(parser, token, 2, 0, "# \t=", PARSE_LAST_IS_GREEDY)) { // TODO: ';' is comment char too | 101 | while (config_read(parser, token, 2, 2, "# \t=", PARSE_LAST_IS_GREEDY)) { // TODO: ';' is comment char too |
102 | if (!token[1]) { | 102 | // if (!token[1]) { |
103 | bb_error_msg(WARN_BAD_LINE, filename, parser->lineno); | 103 | // bb_error_msg(WARN_BAD_LINE, filename, parser->lineno); |
104 | } else { | 104 | // } else { |
105 | { | ||
105 | #if 0 | 106 | #if 0 |
106 | char *s = xasprintf("%s=%s", token[0], token[1]); | 107 | char *s = xasprintf("%s=%s", token[0], token[1]); |
107 | sysctl_write_setting(s); | 108 | sysctl_write_setting(s); |
@@ -205,7 +206,7 @@ static int sysctl_read_setting(const char *name) | |||
205 | while ((cptr = strchr(outname, '/')) != NULL) | 206 | while ((cptr = strchr(outname, '/')) != NULL) |
206 | *cptr = '.'; | 207 | *cptr = '.'; |
207 | 208 | ||
208 | fp = fopen(tmpname, "r"); | 209 | fp = fopen_for_read(tmpname); |
209 | if (fp == NULL) { | 210 | if (fp == NULL) { |
210 | switch (errno) { | 211 | switch (errno) { |
211 | case ENOENT: | 212 | case ENOENT: |