summaryrefslogtreecommitdiffstats
path: root/src/wgtpkg-workdir.c
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2016-03-16 16:05:28 +0100
committerJosé Bollo <jose.bollo@iot.bzh>2016-03-16 17:31:58 +0100
commit2c6fcae14552ab6e7addc82516617a135f86b5ca (patch)
treee6c8aff7b0fca5ef81c02bfb7c2d71ec6fc97046 /src/wgtpkg-workdir.c
parentabfae2b6d73d7be40ffbff8e8429f71d82df90b5 (diff)
cmake: improves error detection
Add detection of problem of cast. The problems are corrected in the patch. Change-Id: I8dc1e987531790860e390dea53ddf49d52339cb2 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'src/wgtpkg-workdir.c')
-rw-r--r--src/wgtpkg-workdir.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/wgtpkg-workdir.c b/src/wgtpkg-workdir.c
index 342df48..7d6e2a8 100644
--- a/src/wgtpkg-workdir.c
+++ b/src/wgtpkg-workdir.c
@@ -34,7 +34,7 @@
#include "wgtpkg-workdir.h"
#include "utils-dir.h"
-static const int dirmode = 0755;
+static const mode_t dirmode = 0755;
char workdir[PATH_MAX] = { 0, };
int workdirfd = -1;
@@ -116,7 +116,7 @@ int make_workdir(const char *root, const char *prefix, int reuse)
put_workdir(AT_FDCWD, ".", 1);
n = snprintf(workdir, sizeof workdir, "%s/%s", root, prefix);
- if (n >= sizeof workdir) {
+ if (n >= (int)sizeof workdir) {
ERROR("workdir prefix too long");
errno = EINVAL;
return -1;
@@ -129,7 +129,7 @@ int make_workdir(const char *root, const char *prefix, int reuse)
ERROR("exhaustion of workdirs");
return -1;
}
- l = snprintf(workdir + n, r, "%d", i);
+ l = snprintf(workdir + n, (unsigned)r, "%d", i);
if (l >= r) {
ERROR("computed workdir too long");
errno = EINVAL;
@@ -156,7 +156,8 @@ int make_workdir(const char *root, const char *prefix, int reuse)
int move_workdir(const char *dest, int parents, int force)
{
- int rc, len;
+ int rc;
+ size_t len;
struct stat s;
char *copy;
const char *iter;
@@ -194,7 +195,7 @@ int move_workdir(const char *dest, int parents, int force)
} else {
/* check parent of dest */
iter = strrchr(dest, '/');
- len = iter ? iter - dest : 0;
+ len = iter ? (size_t)(iter - dest) : 0;
if (len) {
/* is parent existing? */
copy = strndupa(dest, len);