Refactor InternalTask to take a functor

[builder.git] / source / tar.cpp

diff --git a/source/tar.cpp b/source/tar.cpp
index 8de76fe34feca85787d3d4f26f802ecea68332d9..446aa922a0c6baba68209219b800f57fc3dd0f61 100644 (file)
--- a/source/tar.cpp
+++ b/source/tar.cpp
@@ -4,6 +4,7 @@
 #include <msp/io/file.h>
 #include <msp/io/print.h>
 #include "builder.h"
+#include "internaltask.h"
 #include "sourcepackage.h"
 #include "tar.h"
 #include "tarball.h"
@@ -34,16 +35,10 @@ Target *Tar::create_target(const vector<Target *> &sources, const string &arg)
 Task *Tar::run(const Target &target) const
 {
        const TarBall &tarball = dynamic_cast<const TarBall &>(target);
-       Worker *worker = new Worker(tarball);
-       return new InternalTask(worker);
+       return new InternalTask([&tarball]{ return _run(tarball); });
 }
 
-
-Tar::Worker::Worker(const TarBall &tb):
-       tarball(tb)
-{ }
-
-void Tar::Worker::main()
+bool Tar::_run(const TarBall &tarball)
 {
        const FS::Path &pkg_src = tarball.get_package()->get_source_directory();
        FS::Path basedir = FS::basepart(FS::basename(tarball.get_path()));
@@ -62,8 +57,7 @@ void Tar::Worker::main()
                if(rel_path.size()>99)
                {
                        IO::print("Can't store %s in tar archive - too long name\n", rel_path);
-                       status = Task::ERROR;
-                       return;
+                       return false;
                }
 
                memcpy(buf, rel_path.data(), rel_path.size());
@@ -93,10 +87,10 @@ void Tar::Worker::main()
                }
        }
 
-       status = Task::SUCCESS;
+       return true;
 }
 
-void Tar::Worker::store_number(char *buf, unsigned value, unsigned length)
+void Tar::store_number(char *buf, unsigned value, unsigned length)
 {
        for(unsigned i=length; i--;)
        {