summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Buren <braewoods+rb@braewoods.net>2021-07-09 19:40:00 +0000
committerWilliam Wilgus <me.theuser@yahoo.com>2021-07-10 13:44:03 +0000
commita1bcca645bbe10f74cb4888b0f22a0f33637c794 (patch)
treee38bc5424369871ae07f80e11689504eacdd8e10
parent6c084ac3ea71bed6af264f029a48557707cfbb91 (diff)
downloadrockbox-a1bcca645bbe10f74cb4888b0f22a0f33637c794.tar.gz
rockbox-a1bcca645bbe10f74cb4888b0f22a0f33637c794.zip
zip: rename modts field to mtime
This brings it more in line with other structs with this exact same data type and usage. Change-Id: I5fe8564750ef28ccd0b12efedca2e6958369f712
-rw-r--r--firmware/common/zip.c4
-rw-r--r--firmware/include/zip.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/firmware/common/zip.c b/firmware/common/zip.c
index e3ffd90af2..c2e5da6651 100644
--- a/firmware/common/zip.c
+++ b/firmware/common/zip.c
@@ -305,7 +305,7 @@ static int zip_read_cd(struct zip* z, bool use_cb) {
305 305
306 args->entry = i + 1; 306 args->entry = i + 1;
307 args->file_size = cd->uncompressed_size; 307 args->file_size = cd->uncompressed_size;
308 args->modts = dostime_mktime(letoh16(cdd->date), letoh16(cdd->time)); 308 args->mtime = dostime_mktime(letoh16(cdd->date), letoh16(cdd->time));
309 309
310 memcpy(lf->name, mem, name_length); 310 memcpy(lf->name, mem, name_length);
311 lf->name[name_length] = '\0'; 311 lf->name[name_length] = '\0';
@@ -426,7 +426,7 @@ static int zip_read_entry(struct zip* z, uint16_t i, void* mem, uint32_t mem_siz
426 426
427 args->entry = i + 1; 427 args->entry = i + 1;
428 args->file_size = lf->uncompressed_size; 428 args->file_size = lf->uncompressed_size;
429 args->modts = dostime_mktime(lf->date, lf->time); 429 args->mtime = dostime_mktime(lf->date, lf->time);
430 args->block = NULL; 430 args->block = NULL;
431 args->block_size = 0; 431 args->block_size = 0;
432 args->read_size = 0; 432 args->read_size = 0;
diff --git a/firmware/include/zip.h b/firmware/include/zip.h
index e58466dff0..f6870a53d2 100644
--- a/firmware/include/zip.h
+++ b/firmware/include/zip.h
@@ -40,7 +40,7 @@ struct zip_args {
40 uint16_t entries; 40 uint16_t entries;
41 char* name; 41 char* name;
42 uint32_t file_size; 42 uint32_t file_size;
43 time_t modts; 43 time_t mtime;
44 void* block; 44 void* block;
45 uint32_t block_size; 45 uint32_t block_size;
46 uint32_t read_size; 46 uint32_t read_size;