Skip to content
Snippets Groups Projects
Commit e627d794 authored by Dominik Loidolt's avatar Dominik Loidolt
Browse files

Fix type in str2uint8_arr and read_file_cmp_entity function

parent bc56db49
Branches
Tags
1 merge request!34Update cmp_tool to version v0.13
...@@ -1184,7 +1184,7 @@ static __inline ssize_t str2uint8_arr(const char *str, uint8_t *data, uint32_t b ...@@ -1184,7 +1184,7 @@ static __inline ssize_t str2uint8_arr(const char *str, uint8_t *data, uint32_t b
{ {
const char *nptr = str; const char *nptr = str;
const char *eptr = NULL; const char *eptr = NULL;
size_t i = 0; uint32_t i = 0;
errno = 0; errno = 0;
...@@ -1202,7 +1202,7 @@ static __inline ssize_t str2uint8_arr(const char *str, uint8_t *data, uint32_t b ...@@ -1202,7 +1202,7 @@ static __inline ssize_t str2uint8_arr(const char *str, uint8_t *data, uint32_t b
if (!data) /* finished counting the sample */ if (!data) /* finished counting the sample */
break; break;
fprintf(stderr, "%s: %s: Error: The files do not contain enough data. Expected: 0x%x, has 0x%lx.\n", fprintf(stderr, "%s: %s: Error: The files do not contain enough data. Expected: 0x%x, has 0x%x.\n",
PROGRAM_NAME, file_name, buf_size, i); PROGRAM_NAME, file_name, buf_size, i);
return -1; return -1;
} }
...@@ -1461,7 +1461,7 @@ ssize_t read_file_cmp_entity(const char *file_name, struct cmp_entity *ent, ...@@ -1461,7 +1461,7 @@ ssize_t read_file_cmp_entity(const char *file_name, struct cmp_entity *ent,
} }
if (size != (ssize_t)cmp_ent_get_size(ent)) { if (size != (ssize_t)cmp_ent_get_size(ent)) {
fprintf(stderr, "%s: %s: The size of the compression entity set in the header of the compression entity is not the same size as the read-in file has. Expected: 0x%x, has 0x%lx.\n", fprintf(stderr, "%s: %s: The size of the compression entity set in the header of the compression entity is not the same size as the read-in file has. Expected: 0x%x, has 0x%lx.\n",
PROGRAM_NAME, file_name, cmp_ent_get_size(ent), (size_t)size); PROGRAM_NAME, file_name, cmp_ent_get_size(ent), (unsigned long)size);
return -1; return -1;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment