aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael G. Martins <rafael@rafaelmartins.eng.br>2017-09-14 21:15:22 +0200
committerRafael G. Martins <rafael@rafaelmartins.eng.br>2017-09-14 21:15:22 +0200
commitd97b40aa34f53b612900e992c66d321878d7f976 (patch)
tree36e1fa08d8bf0f7ca9f88c7ab47f1bc151a6e56e
parent8a2a49f7c321145fdbf3d8f5bafa5139e8045fb8 (diff)
downloadblogc-d97b40aa34f53b612900e992c66d321878d7f976.tar.gz
blogc-d97b40aa34f53b612900e992c66d321878d7f976.tar.bz2
blogc-d97b40aa34f53b612900e992c66d321878d7f976.zip
make: renamed bm_exec_empty_dir()
-rw-r--r--src/blogc-make/exec-native.c4
-rw-r--r--src/blogc-make/exec-native.h2
-rw-r--r--src/blogc-make/rules.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/blogc-make/exec-native.c b/src/blogc-make/exec-native.c
index a02cd26..ae5517d 100644
--- a/src/blogc-make/exec-native.c
+++ b/src/blogc-make/exec-native.c
@@ -89,7 +89,7 @@ bm_exec_native_cp(bm_filectx_t *source, bm_filectx_t *dest, bool verbose)
bool
-bm_exec_empty_dir(const char *dir, bc_error_t **err)
+bm_exec_native_is_empty_dir(const char *dir, bc_error_t **err)
{
DIR *d = opendir(dir);
if (d == NULL) {
@@ -149,7 +149,7 @@ bm_exec_native_rm(const char *output_dir, bm_filectx_t *dest, bool verbose)
bc_error_t *err = NULL;
while ((0 != strcmp(short_dir, ".")) && (0 != strcmp(short_dir, "/"))) {
- bool empty = bm_exec_empty_dir(dir, &err);
+ bool empty = bm_exec_native_is_empty_dir(dir, &err);
if (err != NULL) {
fprintf(stderr, "blogc-make: error: %s\n", err->msg);
bc_error_free(err);
diff --git a/src/blogc-make/exec-native.h b/src/blogc-make/exec-native.h
index a32b8d2..b6db3cc 100644
--- a/src/blogc-make/exec-native.h
+++ b/src/blogc-make/exec-native.h
@@ -14,7 +14,7 @@
#include "ctx.h"
int bm_exec_native_cp(bm_filectx_t *source, bm_filectx_t *dest, bool verbose);
-bool bm_exec_empty_dir(const char *dir, bc_error_t **err);
+bool bm_exec_native_is_empty_dir(const char *dir, bc_error_t **err);
int bm_exec_native_rm(const char *output_dir, bm_filectx_t *dest, bool verbose);
#endif /* _MAKE_EXEC_NATIVE_H */
diff --git a/src/blogc-make/rules.c b/src/blogc-make/rules.c
index f27ef91..c0893fa 100644
--- a/src/blogc-make/rules.c
+++ b/src/blogc-make/rules.c
@@ -546,7 +546,7 @@ clean_exec(bm_ctx_t *ctx, bc_slist_t *outputs, bc_trie_t *args)
}
}
- if (!bm_exec_empty_dir(ctx->output_dir, NULL)) {
+ if (!bm_exec_native_is_empty_dir(ctx->output_dir, NULL)) {
fprintf(stderr, "blogc-make: warning: output directory is not empty!\n");
}