diff options
| author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2008-05-16 11:53:42 +0300 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2008-05-16 11:53:42 +0300 |
| commit | 35aa758c890ac67a108731f9e8c519fa4208da4b (patch) | |
| tree | 603cc26bd03aa35e57ab76957847d2f9dbc84960 | |
| parent | 54adf125103fd593eec637975c472ad19270a51c (diff) | |
ubi-utils: remove unnecessary ubinize warning
... and fix help message.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
| -rw-r--r-- | ubi-utils/new-utils/src/ubinize.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ubi-utils/new-utils/src/ubinize.c b/ubi-utils/new-utils/src/ubinize.c index 3e4c98b..af26d14 100644 --- a/ubi-utils/new-utils/src/ubinize.c +++ b/ubi-utils/new-utils/src/ubinize.c @@ -77,8 +77,8 @@ static const char *optionsstr = static const char *usage = "Usage: " PROGRAM_NAME " [-o filename] [-h] [-V] [--output=<filename>] [--help]\n" "\t\t[--version] ini-file\n" -"Example: " PROGRAM_NAME " -o ubi.img cfg.ini - create UBI image 'ubi.img' as\n" -" described by configuration file 'cfg.ini'"; +"Example: " PROGRAM_NAME " -o ubi.img -p 16KiB -m 512 -s 256 cfg.ini - create UBI image\n" +" 'ubi.img' as described by configuration file 'cfg.ini'"; static const char *ini_doc = "INI-file format.\n" "The input configuration ini-file describes all the volumes which have to\n" @@ -383,11 +383,9 @@ static int read_section(const char *sname, struct ubigen_vol_info *vi, /* Fetch volume alignment */ sprintf(buf, "%s:vol_alignment", sname); vi->alignment = iniparser_getint(args.dict, buf, -1); - if (vi->alignment == -1) { - normsg("volume alignment was not specified in section " - "\"%s\", assume 1", sname); - vi->alignment = 1; - } else if (vi->id < 0) + if (vi->alignment == -1) + vi->alignment = 1; + else if (vi->id < 0) return errmsg("negative volume alignement %d", vi->alignment); verbose(args.verbose, "volume alignment: %d", vi->alignment); |