Skip to content

Commit

Permalink
parse.c: don't print error message on callback rv > 0
Browse files Browse the repository at this point in the history
A callback return value < 0 means there was an error, so print
out an error message.  But a rv > 0 is used by the mount_unknown_fs
functions to say "we found the one we want, stop here."

Document this, and only print an error message if rv < 0.  Otherwise,

	lxc-create -B lvm --fstype ext3 -t ubuntu -n u1

will print an (innocuous) error message about being unable to parse
the config value 'ext3'.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
  • Loading branch information
hallyn committed Oct 18, 2013
1 parent 6e7e54d commit 8daccdb
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/lxc/parse.c
Expand Up @@ -102,7 +102,10 @@ int lxc_file_for_each_line(const char *file, lxc_file_cb callback, void *data)
while (getline(&line, &len, f) != -1) {
err = callback(line, data);
if (err) {
ERROR("Failed to parse config: %s", line);
// callback rv > 0 means stop here
// callback rv < 0 means error
if (err < 0)
ERROR("Failed to parse config: %s", line);
break;
}
}
Expand Down

0 comments on commit 8daccdb

Please sign in to comment.