From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 09/14] move unlink_recursive declaration to libfile.h
Date: Tue, 19 Apr 2016 09:36:47 +0200 [thread overview]
Message-ID: <1461051412-25711-10-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1461051412-25711-1-git-send-email-s.hauer@pengutronix.de>
unlink_recursive is a file utility function, so move the prototype to
libfile.h
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
commands/loadenv.c | 1 +
commands/rm.c | 1 +
include/fs.h | 2 --
include/libfile.h | 2 ++
lib/unlink-recursive.c | 1 +
5 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/commands/loadenv.c b/commands/loadenv.c
index 8d6be2f..44e96c3 100644
--- a/commands/loadenv.c
+++ b/commands/loadenv.c
@@ -26,6 +26,7 @@
#include <envfs.h>
#include <errno.h>
#include <fs.h>
+#include <libfile.h>
#include <malloc.h>
#include <globalvar.h>
diff --git a/commands/rm.c b/commands/rm.c
index 5f1f582..4eebb3d 100644
--- a/commands/rm.c
+++ b/commands/rm.c
@@ -19,6 +19,7 @@
#include <common.h>
#include <command.h>
#include <fs.h>
+#include <libfile.h>
#include <getopt.h>
#include <errno.h>
diff --git a/include/fs.h b/include/fs.h
index 21490db..7081227 100644
--- a/include/fs.h
+++ b/include/fs.h
@@ -179,8 +179,6 @@ void automount_remove(const char *_path);
int automount_add(const char *path, const char *cmd);
void automount_print(void);
-int unlink_recursive(const char *path, char **failedpath);
-
int fsdev_open_cdev(struct fs_device_d *fsdev);
const char *cdev_get_mount_path(struct cdev *cdev);
const char *cdev_mount_default(struct cdev *cdev, const char *fsoptions);
diff --git a/include/libfile.h b/include/libfile.h
index 3f81718..de4f42d 100644
--- a/include/libfile.h
+++ b/include/libfile.h
@@ -24,4 +24,6 @@ int open_and_lseek(const char *filename, int mode, loff_t pos);
/* Create a directory and its parents */
int make_directory(const char *pathname);
+int unlink_recursive(const char *path, char **failedpath);
+
#endif /* __LIBFILE_H */
diff --git a/lib/unlink-recursive.c b/lib/unlink-recursive.c
index 78dc015..434fdc7 100644
--- a/lib/unlink-recursive.c
+++ b/lib/unlink-recursive.c
@@ -1,4 +1,5 @@
#include <common.h>
+#include <libfile.h>
#include <errno.h>
#include <libbb.h>
#include <fs.h>
--
2.7.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2016-04-19 7:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-19 7:36 include/prototype cleanup Sascha Hauer
2016-04-19 7:36 ` [PATCH 01/14] include: move run_command prototype to command.h Sascha Hauer
2016-04-19 7:36 ` [PATCH 02/14] include/common.h: remove unused struct memarea_info Sascha Hauer
2016-04-19 7:36 ` [PATCH 03/14] include: move shell prototypes to shell.h Sascha Hauer
2016-04-19 7:36 ` [PATCH 04/14] include: move crc specific stuff to crc.h Sascha Hauer
2016-04-19 7:36 ` [PATCH 05/14] libfile: move open_and_lseek() to libfile Sascha Hauer
2016-04-19 7:36 ` [PATCH 06/14] show_progress: print spaces with %*s Sascha Hauer
2016-04-19 7:36 ` [PATCH 07/14] string: Fix (v)asprintf prototypes Sascha Hauer
2016-04-19 7:36 ` [PATCH 08/14] move make_directory declaration to libfile.h Sascha Hauer
2016-04-19 7:36 ` Sascha Hauer [this message]
2016-04-19 7:36 ` [PATCH 10/14] fs: move libc function prototypes to their correct locations Sascha Hauer
2016-04-19 7:36 ` [PATCH 11/14] stdio: rename getc to getchar Sascha Hauer
2016-04-19 7:36 ` [PATCH 12/14] stdio: replace fprintf(stderr,...) with eprintf Sascha Hauer
2016-04-19 7:36 ` [PATCH 13/14] stdio: Replace FILE functions with filedescriptor functions Sascha Hauer
2016-04-19 7:36 ` [PATCH 14/14] stdio: Whitespace cleanup Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461051412-25711-10-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox