diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
| commit | 9db69882bee2d528d706d61d34ef7741122330be (patch) | |
| tree | f46c4ed5cae58956cd165e552ea4e366fd9b1a6c /libbb/parse_config.c | |
| parent | 3f357a9c754805c4c38793749927aeda82797735 (diff) | |
| parent | e4dcba1c103dc28e927e004791e331aaf604383d (diff) | |
| download | busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.gz busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.bz2 busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.zip | |
Merge commit 'e4dcba1c103dc28e927e004791e331aaf604383d'
Conflicts:
libbb/make_directory.c
Diffstat (limited to 'libbb/parse_config.c')
| -rw-r--r-- | libbb/parse_config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbb/parse_config.c b/libbb/parse_config.c index 9dbfaf5d7..d471edbee 100644 --- a/libbb/parse_config.c +++ b/libbb/parse_config.c | |||
| @@ -45,7 +45,7 @@ int parse_main(int argc UNUSED_PARAM, char **argv) | |||
| 45 | Typical usage: | 45 | Typical usage: |
| 46 | 46 | ||
| 47 | ----- CUT ----- | 47 | ----- CUT ----- |
| 48 | char *t[3]; // tokens placeholder | 48 | char *t[3]; // tokens placeholder |
| 49 | parser_t *p = config_open(filename); | 49 | parser_t *p = config_open(filename); |
| 50 | if (p) { | 50 | if (p) { |
| 51 | // parse line-by-line | 51 | // parse line-by-line |