upgrade-apply-deltafs: Fix compiler warnings

Change-Id: I6249d461d5f4b7b1c342cebd8dcffe4c30a4511d

diff --git a/src/upgrade-apply-deltafs/engine/SS_FSUpdate.c b/src/upgrade-apply-deltafs/engine/SS_FSUpdate.c
index 1cb321139082fac7f85c8fd9593452bca06e50db..01e0d5042374908a60ef259fe74beaa4905bb760 100755 (executable)
--- 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 414e1a0a69107cb24c3a1c0ec0043617d2c7036f..32c49f54addb6ebfe7cb099d3f21f688abef9d22 100755 (executable)
--- 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 54dba8aa6faab890976cd57fa9481b20dc4a7b38..44f011449af2a1acfde05c90ba6c66b782d7f164 100755 (executable)
--- 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;
 }
 /*-----------------------------------------------------------------------------