diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2016-10-11 16:34:46 +0200 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2016-10-18 09:30:31 +0200 |
| commit | 38ba270af828b80e0ffb5eab955aff733de17dba (patch) | |
| tree | 8f1c9dc7f0abfc212675f93e01854722e9fcf89d /src | |
| parent | 353f837dd260914d814748cc196d129234ba265f (diff) | |
Minor improvements
- Clean cmake files
- Fix orthograph and vocabulary
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/wgtpkg-install.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ac5c105..6610251 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -47,7 +47,7 @@ include_directories(${EXTRAS_INCLUDE_DIRS}) link_libraries(${EXTRAS_LIBRARIES}) pkg_check_modules(libzip libzip>=0.11) -if(libzip_FOUND) +if(libzip_FOUND AND USE_LIBZIP) add_compile_options(${libzip_CFLAGS}) include_directories(${libzip_INCLUDE_DIRS}) link_libraries(${libzip_LIBRARIES}) diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c index b5f0a40..c1baaa5 100644 --- a/src/wgtpkg-install.c +++ b/src/wgtpkg-install.c @@ -145,7 +145,7 @@ static int move_widget(const char *root, const struct wgt_desc *desc, int force) rc = snprintf(newdir, sizeof newdir, "%s/%s/%s", root, desc->id, desc->ver); if (rc >= (int)sizeof newdir) { - ERROR("path to long in move_widget"); + ERROR("path too long in move_widget"); errno = EINVAL; return -1; } @@ -162,14 +162,14 @@ static int install_icon(const struct wgt_desc *desc) create_directory(FWK_ICON_DIR, 0755, 1); rc = snprintf(link, sizeof link, "%s/%s", FWK_ICON_DIR, desc->idaver); if (rc >= (int)sizeof link) { - ERROR("link to long in install_icon"); + ERROR("link too long in install_icon"); errno = EINVAL; return -1; } rc = snprintf(target, sizeof target, "%s/%s", workdir, desc->icons->src); if (rc >= (int)sizeof target) { - ERROR("target to long in install_icon"); + ERROR("target too long in install_icon"); errno = EINVAL; return -1; } @@ -284,7 +284,7 @@ struct wgt_info *install_widget(const char *wgtfile, const char *root, int force if (install_security(desc)) goto error3; - + file_reset(); return ifo; |