From 3b70edecb55afc97d922d0636b87f35d8a4ec27e Mon Sep 17 00:00:00 2001 From: Antoni Adaszkiewicz Date: Mon, 10 Oct 2022 16:06:23 +0200 Subject: [PATCH] upgrade-apply-deltafs: Fix compiler warnings Change-Id: I6249d461d5f4b7b1c342cebd8dcffe4c30a4511d --- src/upgrade-apply-deltafs/engine/SS_FSUpdate.c | 10 +++++----- src/upgrade-apply-deltafs/engine/SS_PatchDelta.c | 2 +- src/upgrade-apply-deltafs/ua.c | 6 ++++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/upgrade-apply-deltafs/engine/SS_FSUpdate.c b/src/upgrade-apply-deltafs/engine/SS_FSUpdate.c index 1cb3211..01e0d50 100755 --- a/src/upgrade-apply-deltafs/engine/SS_FSUpdate.c +++ b/src/upgrade-apply-deltafs/engine/SS_FSUpdate.c @@ -832,19 +832,19 @@ long SS_SetFileAttributes(const char *ui16pFilePath, has_cap = 0; if (*smack_attr_pos != '\0') { char *cap_mark = "capability=0x"; - int cap_mark_len = strlen(cap_mark); psmack = strstr(smack_attr_pos, cap_mark); if (psmack) { int cap_hex_len; int i; char ch1, ch2; int raw1, raw2; + size_t cap_mark_len = strlen(cap_mark); tp = strstr(psmack, ":"); smack_attr_pos = tp + 1; memset(tmpSmackAttribs, 0x0, sizeof(tmpSmackAttribs)); - memcpy(tmpSmackAttribs, psmack+cap_mark_len, - (int)tp - (int)psmack - cap_mark_len); + memcpy(tmpSmackAttribs, psmack + cap_mark_len, + (size_t)(tp - psmack - cap_mark_len)); // convert hexadecimal into raw data cap_hex_len = strlen(tmpSmackAttribs); @@ -873,19 +873,19 @@ long SS_SetFileAttributes(const char *ui16pFilePath, has_acl = 0; if (*smack_attr_pos != '\0') { char *acl_mark = "acl_access=0x"; - int acl_mark_len = strlen(acl_mark); psmack = strstr(smack_attr_pos, acl_mark); if (psmack) { int acl_hex_len; int i; char ch1, ch2; int raw1, raw2; + size_t acl_mark_len = strlen(acl_mark); tp = strstr(psmack, ":"); smack_attr_pos = tp + 1; memset(tmpSmackAttribs, 0x0, sizeof(tmpSmackAttribs)); memcpy(tmpSmackAttribs, psmack+acl_mark_len, - (int)tp - (int)psmack - acl_mark_len); + (size_t)(tp - psmack - acl_mark_len)); // convert hexadecimal into raw data acl_hex_len = strlen(tmpSmackAttribs); diff --git a/src/upgrade-apply-deltafs/engine/SS_PatchDelta.c b/src/upgrade-apply-deltafs/engine/SS_PatchDelta.c index 414e1a0..32c49f5 100755 --- a/src/upgrade-apply-deltafs/engine/SS_PatchDelta.c +++ b/src/upgrade-apply-deltafs/engine/SS_PatchDelta.c @@ -201,7 +201,7 @@ int SS_UpdateDeltaFS(const char *source_filename, const char *target_filename, do { int enough_space = 0; - size_t free_space = 0; + SS_UINT32 free_space = 0; if (retry > 0) { SS_GetAvailableFreeSpace(source_filename, &free_space); diff --git a/src/upgrade-apply-deltafs/ua.c b/src/upgrade-apply-deltafs/ua.c index 54dba8a..44f0114 100755 --- a/src/upgrade-apply-deltafs/ua.c +++ b/src/upgrade-apply-deltafs/ua.c @@ -652,14 +652,16 @@ int set_delta_folder(void) { char *pos = strrchr(delta_path, '/'); if (pos == NULL) { - snprintf(delta_folder, MAX_FOLDER_PATH, ".", delta_path); // if no "/" in delta path, assume current directory as delta folder + snprintf(delta_folder, MAX_FOLDER_PATH, "."); // if no "/" in delta path, assume current directory as delta folder return 0; } if ((pos - delta_path + 1) == strlen(delta_path)) { print_usage("Invalid delta path"); return -1; } - snprintf(delta_folder, (pos - delta_path) + 1, "%s", delta_path); + if (snprintf(delta_folder, (pos - delta_path) + 1, "%s", delta_path) < 0) { + LOGE("unexpected snprintf() error\n"); + } return 0; } /*----------------------------------------------------------------------------- -- 2.7.4