diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2024-05-05 14:04:20 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2024-05-05 14:05:13 -0400 |
commit | c34076b2a591f8fc134b73d664fd8bd0b438d8ec (patch) | |
tree | 54f7fca8ca31fa586d753103c17543dd7bacaf8e | |
parent | d7c541742f5e6ec07dbcc8e1346efde9d807437e (diff) | |
download | rockbox-c34076b2a591f8fc134b73d664fd8bd0b438d8ec.tar.gz rockbox-c34076b2a591f8fc134b73d664fd8bd0b438d8ec.zip |
Theme Editor: Make it compile with modern toolchains
Change-Id: Idc0ef3dd34ab186b4ea40f4d916a2addf87eb478
-rw-r--r-- | utils/themeeditor/quazip/crypt.h | 8 | ||||
-rw-r--r-- | utils/themeeditor/quazip/unzip.c | 6 | ||||
-rw-r--r-- | utils/themeeditor/quazip/zip.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/utils/themeeditor/quazip/crypt.h b/utils/themeeditor/quazip/crypt.h index 82748c5715..2316f0c604 100644 --- a/utils/themeeditor/quazip/crypt.h +++ b/utils/themeeditor/quazip/crypt.h | |||
@@ -32,7 +32,7 @@ | |||
32 | /*********************************************************************** | 32 | /*********************************************************************** |
33 | * Return the next byte in the pseudo-random sequence | 33 | * Return the next byte in the pseudo-random sequence |
34 | */ | 34 | */ |
35 | static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab) | 35 | static int decrypt_byte(unsigned long* pkeys, const uint32_t* pcrc_32_tab) |
36 | { | 36 | { |
37 | (void) pcrc_32_tab; /* avoid "unused parameter" warning */ | 37 | (void) pcrc_32_tab; /* avoid "unused parameter" warning */ |
38 | unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an | 38 | unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an |
@@ -46,7 +46,7 @@ static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab) | |||
46 | /*********************************************************************** | 46 | /*********************************************************************** |
47 | * Update the encryption keys with the next byte of plain text | 47 | * Update the encryption keys with the next byte of plain text |
48 | */ | 48 | */ |
49 | static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c) | 49 | static int update_keys(unsigned long* pkeys,const uint32_t* pcrc_32_tab,int c) |
50 | { | 50 | { |
51 | (*(pkeys+0)) = CRC32((*(pkeys+0)), c); | 51 | (*(pkeys+0)) = CRC32((*(pkeys+0)), c); |
52 | (*(pkeys+1)) += (*(pkeys+0)) & 0xff; | 52 | (*(pkeys+1)) += (*(pkeys+0)) & 0xff; |
@@ -63,7 +63,7 @@ static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int | |||
63 | * Initialize the encryption keys and the random header according to | 63 | * Initialize the encryption keys and the random header according to |
64 | * the given password. | 64 | * the given password. |
65 | */ | 65 | */ |
66 | static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab) | 66 | static void init_keys(const char* passwd,unsigned long* pkeys,const uint32_t* pcrc_32_tab) |
67 | { | 67 | { |
68 | *(pkeys+0) = 305419896L; | 68 | *(pkeys+0) = 305419896L; |
69 | *(pkeys+1) = 591751049L; | 69 | *(pkeys+1) = 591751049L; |
@@ -93,7 +93,7 @@ static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting) | |||
93 | unsigned char *buf; /* where to write header */ | 93 | unsigned char *buf; /* where to write header */ |
94 | int bufSize; | 94 | int bufSize; |
95 | unsigned long* pkeys; | 95 | unsigned long* pkeys; |
96 | const unsigned long* pcrc_32_tab; | 96 | const uint32_t* pcrc_32_tab; |
97 | unsigned long crcForCrypting; | 97 | unsigned long crcForCrypting; |
98 | { | 98 | { |
99 | int n; /* index in random header */ | 99 | int n; /* index in random header */ |
diff --git a/utils/themeeditor/quazip/unzip.c b/utils/themeeditor/quazip/unzip.c index ace7a08837..59bab3ccc1 100644 --- a/utils/themeeditor/quazip/unzip.c +++ b/utils/themeeditor/quazip/unzip.c | |||
@@ -147,7 +147,7 @@ typedef struct | |||
147 | int encrypted; | 147 | int encrypted; |
148 | # ifndef NOUNCRYPT | 148 | # ifndef NOUNCRYPT |
149 | unsigned long keys[3]; /* keys defining the pseudo-random sequence */ | 149 | unsigned long keys[3]; /* keys defining the pseudo-random sequence */ |
150 | const unsigned long* pcrc_32_tab; | 150 | const uint32_t* pcrc_32_tab; |
151 | # endif | 151 | # endif |
152 | } unz_s; | 152 | } unz_s; |
153 | 153 | ||
@@ -204,7 +204,7 @@ local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX) | |||
204 | uLong *pX; | 204 | uLong *pX; |
205 | { | 205 | { |
206 | uLong x ; | 206 | uLong x ; |
207 | int i; | 207 | int i = 0; |
208 | int err; | 208 | int err; |
209 | 209 | ||
210 | err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); | 210 | err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); |
@@ -232,7 +232,7 @@ local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX) | |||
232 | uLong *pX; | 232 | uLong *pX; |
233 | { | 233 | { |
234 | uLong x ; | 234 | uLong x ; |
235 | int i; | 235 | int i = 0; |
236 | int err; | 236 | int err; |
237 | 237 | ||
238 | err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); | 238 | err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); |
diff --git a/utils/themeeditor/quazip/zip.c b/utils/themeeditor/quazip/zip.c index 13463fe336..77c8726b3a 100644 --- a/utils/themeeditor/quazip/zip.c +++ b/utils/themeeditor/quazip/zip.c | |||
@@ -130,7 +130,7 @@ typedef struct | |||
130 | int encrypt; | 130 | int encrypt; |
131 | #ifndef NOCRYPT | 131 | #ifndef NOCRYPT |
132 | unsigned long keys[3]; /* keys defining the pseudo-random sequence */ | 132 | unsigned long keys[3]; /* keys defining the pseudo-random sequence */ |
133 | const unsigned long* pcrc_32_tab; | 133 | const uint32_t* pcrc_32_tab; |
134 | int crypt_header_size; | 134 | int crypt_header_size; |
135 | #endif | 135 | #endif |
136 | } curfile_info; | 136 | } curfile_info; |