diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:48:51 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:48:51 +0100 |
| commit | 22e254480982a45b44b425a25f3262b72da4ed0d (patch) | |
| tree | 83256d0ad6ccdfe0f368283b823b855dc5ad0b2e /common/environment.c | |
| parent | db63bd8e10abf033e0a49932e2319a76b0fa9c1b (diff) | |
| parent | a81c6a9f16db267aad65f13ced0e25b91cbca179 (diff) | |
| download | barebox-22e254480982a45b44b425a25f3262b72da4ed0d.tar.gz barebox-22e254480982a45b44b425a25f3262b72da4ed0d.tar.xz | |
Merge branch 'for-next/compile-log-level'
Conflicts:
drivers/usb/host/ehci-hcd.c
Diffstat (limited to 'common/environment.c')
| -rw-r--r-- | common/environment.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/common/environment.c b/common/environment.c index eebccce100..e8d623f7e4 100644 --- a/common/environment.c +++ b/common/environment.c @@ -113,11 +113,13 @@ static int file_save_action(const char *filename, struct stat *statbuf, memcpy(data->writep, path, len); inode->size = ENVFS_32(len); data->writep += PAD4(len); - debug("handling symlink %s size %ld namelen %d headerlen %d\n", filename + strlen(data->base), - len, namelen, ENVFS_32(inode->headerlen)); + debug("handling symlink %s size %d namelen %d headerlen %d\n", + filename + strlen(data->base), + len, namelen, ENVFS_32(inode->headerlen)); } else { - debug("handling file %s size %ld namelen %d headerlen %d\n", filename + strlen(data->base), - statbuf->st_size, namelen, ENVFS_32(inode->headerlen)); + debug("handling file %s size %lld namelen %d headerlen %d\n", + filename + strlen(data->base), + statbuf->st_size, namelen, ENVFS_32(inode->headerlen)); inode->size = ENVFS_32(statbuf->st_size); fd = open(filename, O_RDONLY); |