diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-02-16 11:43:14 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-02-16 11:43:14 +0000 |
| commit | d1e7e9748d0f6770523ee5cc192fa6101a95b5a1 (patch) | |
| tree | 5cdcba1503e620e94e3326780904b7f780bd048b | |
| parent | 1653edfe373e61c294331d05f75ea2fad6ac3b9c (diff) | |
| download | rabbitmq-server-git-d1e7e9748d0f6770523ee5cc192fa6101a95b5a1.tar.gz | |
Matthias points out this does not need to be second order.
| -rw-r--r-- | src/rabbit_msg_store.erl | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index 5bfd48fbed..fd3027e989 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -1975,12 +1975,11 @@ force_recovery(BaseDir, Store) -> File <- list_sorted_file_names(Dir, ?FILE_EXTENSION_TMP)], ok. -for_each_file(D) -> - fun(Fun, Files) -> [Fun(filename:join(D, File)) || File <- Files] end. +for_each_file(D, Fun, Files) -> + [Fun(filename:join(D, File)) || File <- Files]. -for_each_file(D1, D2) -> - fun(Fun, Files) -> [Fun(filename:join(D1, File), - filename:join(D2, File)) || File <- Files] end. +for_each_file(D1, D2, Fun, Files) -> + [Fun(filename:join(D1, File), filename:join(D2, File)) || File <- Files]. transform_dir(BaseDir, Store, TransformFun) -> Dir = filename:join(BaseDir, atom_to_list(Store)), @@ -1991,11 +1990,11 @@ transform_dir(BaseDir, Store, TransformFun) -> throw({error, transform_failed_previously}); false -> OldFileList = list_sorted_file_names(Dir, ?FILE_EXTENSION), - (for_each_file(Dir, TmpDir))(TransformFile, OldFileList), - (for_each_file(Dir) )(fun file:delete/1, OldFileList), + for_each_file(Dir, TmpDir, TransformFile, OldFileList), + for_each_file(Dir, fun file:delete/1, OldFileList), NewFileList = list_sorted_file_names(TmpDir, ?FILE_EXTENSION), - (for_each_file(TmpDir, Dir))(fun file:copy/2, NewFileList), - (for_each_file(TmpDir) )(fun file:delete/1, NewFileList), + for_each_file(TmpDir, Dir, fun file:copy/2, NewFileList), + for_each_file(TmpDir, fun file:delete/1, NewFileList), ok = file:del_dir(TmpDir) end. |