journal: consistently allow type==0 to mean "any type"

If type==0 and a non-NULL object were given as arguments to
journal_file_hmac_put_object(), its object type check would fail and it
would return -EBADMSG.

All existing callers use either a positive type or -1. Still, for
behavior consistency with journal_file_move_to_object() let's allow
type 0 to pass.
This commit is contained in:
Michal Schmidt
2014-12-10 16:37:29 +01:00
parent d3d3208f60
commit 2df65e7d96

View File

@@ -246,7 +246,7 @@ int journal_file_hmac_put_object(JournalFile *f, int type, Object *o, uint64_t p
if (r < 0)
return r;
} else {
if (type >= 0 && o->object.type != type)
if (type > 0 && o->object.type != type)
return -EBADMSG;
}