c/r: rename restore & friends to __criu_restore

Hopefully this will avoid name collisions with any user binaries, since
criu is just an implementation detail.

Closes #907

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index 16449bcf1ce5b7b27d6ae731279dd1118b84ea87..75ae4e2fce83c79ad596d336e992f9e327587c07 100644 (file)
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -868,12 +868,12 @@ static bool do_dump(struct lxc_container *c, char *mode, char *directory,
        }
 }
 
-bool pre_dump(struct lxc_container *c, char *directory, bool verbose, char *predump_dir)
+bool __criu_pre_dump(struct lxc_container *c, char *directory, bool verbose, char *predump_dir)
 {
        return do_dump(c, "pre-dump", directory, false, verbose, predump_dir);
 }
 
-bool dump(struct lxc_container *c, char *directory, bool stop, bool verbose, char *predump_dir)
+bool __criu_dump(struct lxc_container *c, char *directory, bool stop, bool verbose, char *predump_dir)
 {
        char path[PATH_MAX];
        int ret;
@@ -890,7 +890,7 @@ bool dump(struct lxc_container *c, char *directory, bool stop, bool verbose, cha
        return do_dump(c, "dump", directory, stop, verbose, predump_dir);
 }
 
-bool restore(struct lxc_container *c, char *directory, bool verbose)
+bool __criu_restore(struct lxc_container *c, char *directory, bool verbose)
 {
        pid_t pid;
        int status, nread;

diff --git a/src/lxc/criu.h b/src/lxc/criu.h
index d5491a69eb2b489ee9f3fbe63ac3df46a379d2e8..c110246424efbf68da064b0f017715ae6ad67270 100644 (file)
--- a/src/lxc/criu.h
+++ b/src/lxc/criu.h
@@ -27,8 +27,8 @@
 
 #include <lxc/lxccontainer.h>
 
-bool pre_dump(struct lxc_container *c, char *directory, bool verbose, char *predump_dir);
-bool dump(struct lxc_container *c, char *directory, bool stop, bool verbose, char *predump_dir);
-bool restore(struct lxc_container *c, char *directory, bool verbose);
+bool __criu_pre_dump(struct lxc_container *c, char *directory, bool verbose, char *predump_dir);
+bool __criu_dump(struct lxc_container *c, char *directory, bool stop, bool verbose, char *predump_dir);
+bool __criu_restore(struct lxc_container *c, char *directory, bool verbose);
 
 #endif

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index c11ffe064eeff0c784471971520a2542bce2e821..ab48fb586874df9675d7330a648fcdb8590554c3 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -3960,13 +3960,13 @@ static int do_lxcapi_migrate(struct lxc_container *c, unsigned int cmd,
 
        switch (cmd) {
        case MIGRATE_PRE_DUMP:
-               ret = !pre_dump(c, opts->directory, opts->verbose, opts->predump_dir);
+               ret = !__criu_pre_dump(c, opts->directory, opts->verbose, opts->predump_dir);
                break;
        case MIGRATE_DUMP:
-               ret = !dump(c, opts->directory, opts->stop, opts->verbose, opts->predump_dir);
+               ret = !__criu_dump(c, opts->directory, opts->stop, opts->verbose, opts->predump_dir);
                break;
        case MIGRATE_RESTORE:
-               ret = !restore(c, opts->directory, opts->verbose);
+               ret = !__criu_restore(c, opts->directory, opts->verbose);
                break;
        default:
                ERROR("invalid migrate command %u", cmd);