From 89cd77934835d1f04edd17c718d77591974e01f5 Mon Sep 17 00:00:00 2001 From: Qiang Huang Date: Tue, 24 Sep 2013 15:27:53 +0800 Subject: [PATCH] utils: move remove_trailing_slashes to utils Signed-off-by: Qiang Huang Acked-by: Serge Hallyn Signed-off-by: Serge Hallyn --- src/lxc/lxccontainer.c | 7 ------- src/lxc/utils.c | 7 +++++++ src/lxc/utils.h | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c index ea5a84efc..f5d41b306 100644 --- a/src/lxc/lxccontainer.c +++ b/src/lxc/lxccontainer.c @@ -69,13 +69,6 @@ static bool file_exists(char *f) return stat(f, &statbuf) == 0; } -static void remove_trailing_slashes(char *p) -{ - int l = strlen(p); - while (--l >= 0 && (p[l] == '/' || p[l] == '\n')) - p[l] = '\0'; -} - /* * A few functions to help detect when a container creation failed. * If a container creation was killed partway through, then trying diff --git a/src/lxc/utils.c b/src/lxc/utils.c index a908b5caf..dc94a3cdc 100644 --- a/src/lxc/utils.c +++ b/src/lxc/utils.c @@ -211,6 +211,13 @@ extern int mkdir_p(const char *dir, mode_t mode) return 0; } +extern void remove_trailing_slashes(char *p) +{ + int l = strlen(p); + while (--l >= 0 && (p[l] == '/' || p[l] == '\n')) + p[l] = '\0'; +} + static char *copy_global_config_value(char *p) { int len = strlen(p); diff --git a/src/lxc/utils.h b/src/lxc/utils.h index 55f98fa87..87a914b9b 100644 --- a/src/lxc/utils.h +++ b/src/lxc/utils.h @@ -37,6 +37,7 @@ extern int lxc_rmdir_onedev(char *path); extern int lxc_setup_fs(void); extern int get_u16(unsigned short *val, const char *arg, int base); extern int mkdir_p(const char *dir, mode_t mode); +extern void remove_trailing_slashes(char *p); extern const char *get_rundir(void); /* -- 2.47.3