]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
crushtool: consolidate_whitespace() should eat everything except \n
authorDan Mick <dan.mick@inktank.com>
Thu, 17 Jan 2013 19:18:46 +0000 (11:18 -0800)
committerDan Mick <dan.mick@inktank.com>
Fri, 18 Jan 2013 00:09:05 +0000 (16:09 -0800)
commite776b63dd5c540a6f49b03b67e72a1f4636a74fd
treebfd0a8e464afe7bf6a25ff39f3d2d8ab16e83e9c
parentc236a51a8040508ee893e4c64b206e40f9459a62
crushtool: consolidate_whitespace() should eat everything except \n

CRUSH map source with \r (like a DOS text file) failed to compile
with the usual nonuseful message; turns out that eating \r along with
' ' and '\t' etc. solves that problem.

Fixes: #3834
Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
src/crush/CrushCompiler.cc