1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
|
From ab8572aaa9fe9af22ee50b517cc0e7bdbcbec43a Mon Sep 17 00:00:00 2001
From: "Jeong, Hun" <blmarket@gmail.com>
Date: Thu, 30 May 2024 21:40:42 -0700
Subject: [PATCH] Add explicit type casting to avoid compiler error
Seems gcc14 starts to give error instead of warn, which blocks build on
Arch linux. This commit unblocks by adding explicit casting for all
errors.
reference: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106416
---
src/legacy/cnxz/nxz_common.c | 2 +-
src/legacy/cnxz/nxz_comp.c | 30 +++++++++++++++---------------
src/legacy/cnxz/nxz_decomp.c | 8 ++++----
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/legacy/cnxz/nxz_common.c b/src/legacy/cnxz/nxz_common.c
index a2258cf757..7ab1dbc15a 100644
--- a/src/legacy/cnxz/nxz_common.c
+++ b/src/legacy/cnxz/nxz_common.c
@@ -9,7 +9,7 @@ uint32_t* sub57DD90(uint32_t* this) {
v1 = this;
v2 = calloc(1, 0x224u);
- *v1 = v2;
+ *v1 = (uint32_t)v2;
memset(v2, 0, 0x224u);
return v1;
}
diff --git a/src/legacy/cnxz/nxz_comp.c b/src/legacy/cnxz/nxz_comp.c
index 0285f49784..ad849b9d55 100644
--- a/src/legacy/cnxz/nxz_comp.c
+++ b/src/legacy/cnxz/nxz_comp.c
@@ -469,7 +469,7 @@ uint32_t* sub_57DF00(uint32_t* this) {
v1[1] = 4096;
v2 = calloc(1, sizeof(nxz_table_6));
v3 = v2;
- v1[2] = v2;
+ v1[2] = (uint32_t)v2;
result = v1;
memcpy(v3, nxz_table_6, sizeof(nxz_table_6));
return result;
@@ -486,10 +486,10 @@ void* nxz_compress_new() {
return 0;
}
v2 = v0;
- *v0 = calloc(1, 0x10000u);
+ *v0 = (uint32_t)calloc(1, 0x10000u);
v2[1] = 0;
sub_57DF00(v2 + 2);
- v2[5] = calloc(1, 0x10000u);
+ v2[5] = (uint32_t)calloc(1, 0x10000u);
v3 = 0;
do {
v3 += 2;
@@ -663,8 +663,8 @@ int sub_57DFC0(uint32_t* this, int* a2) {
char v60[1100]; // [esp+30h] [ebp-44Ch]
v2 = this;
- *(uint32_t*)v60 = this;
- v3 = sub_57DEA0(this, &v60[4]);
+ *(uint32_t*)v60 = (uint32_t)this;
+ v3 = sub_57DEA0(this, (uint16_t*)&v60[4]);
v4 = 0;
v5 = 0;
v6 = 16;
@@ -894,7 +894,7 @@ int sub_57E2C0(uint32_t** this) {
*(uint8_t*)v1[3] = HIBYTE(v7);
v8 = v1[5];
v9 = (char*)v1[3] + 1;
- v1[3] = v9;
+ v1[3] = (uint32_t*)v9;
*v9 = BYTE2(v8);
v10 = (int)(v1[6] - 4);
v11 = (uint32_t*)((uint32_t)v1[5] << 16);
@@ -921,7 +921,7 @@ int sub_57E2C0(uint32_t** this) {
*(uint8_t*)v1[3] = HIBYTE(v20);
v21 = (char*)v1[3] + 1;
v22 = (unsigned int)v1[5] >> 16;
- v1[3] = v21;
+ v1[3] = (uint32_t*)v21;
*v21 = v22;
v23 = v1[5];
v24 = (int)(v1[6] - 4);
@@ -960,7 +960,7 @@ int sub_57E7D0(uint32_t** this) {
*(uint8_t*)v1[3] = (unsigned int)v1[5] >> 24;
v4 = v1[5];
v5 = (char*)v1[3] + 1;
- v1[3] = v5;
+ v1[3] = (uint32_t*)v5;
*v5 = BYTE2(v4);
v6 = (int)(v1[6] - 4);
v7 = (uint32_t*)((uint32_t)v1[5] << 16);
@@ -1024,7 +1024,7 @@ unsigned int sub_57E3F0(uint32_t** this, unsigned int a2, int a3) {
*(uint8_t*)v5[3] = (unsigned int)v5[5] >> 24;
v13 = v5[5];
v14 = (char*)v5[3] + 1;
- v5[3] = v14;
+ v5[3] = (uint32_t*)v14;
*v14 = BYTE2(v13);
v15 = (int)(v5[6] - 4);
v16 = (uint32_t*)((uint32_t)v5[5] << 16);
@@ -1056,7 +1056,7 @@ uint32_t* sub_57F160(int this, int a2, int a3) {
**(uint8_t**)(this + 12) = *(uint32_t*)(this + 20) >> 24;
v5 = (uint8_t*)(*(uint32_t*)(this + 12) + 1);
v6 = result[5] >> 16;
- result[3] = v5;
+ result[3] = (uint32_t)v5;
*v5 = v6;
v7 = result[5];
v8 = result[6] - 16;
@@ -1123,7 +1123,7 @@ int sub_57E4C0(uint32_t** this, unsigned int a2, int a3, unsigned int a4, unsign
sub_57E3F0(this, a2, a3);
if (a4 >= 8) {
if (a4 >= 0x26) {
- v23 = &nxz_table_7[(a4 - 38) >> 5];
+ v23 = (unsigned char*)&nxz_table_7[(a4 - 38) >> 5];
v24 = nxz_table_7[(a4 - 38) >> 5].v1 + 4;
if ((int)--*v5[2] <= 0) {
sub_57E2C0(v5);
@@ -1180,7 +1180,7 @@ int sub_57E4C0(uint32_t** this, unsigned int a2, int a3, unsigned int a4, unsign
*(uint8_t*)v5[3] = (unsigned int)v5[5] >> 24;
v30 = v5[5];
v31 = (char*)v5[3] + 1;
- v5[3] = v31;
+ v5[3] = (uint32_t*)v31;
*v31 = BYTE2(v30);
v32 = (int)(v5[6] - 4);
v33 = (uint32_t*)((uint32_t)v5[5] << 16);
@@ -1216,7 +1216,7 @@ int sub_57E4C0(uint32_t** this, unsigned int a2, int a3, unsigned int a4, unsign
*(uint8_t*)v5[3] = HIBYTE(v39);
v40 = v5[5];
v41 = (char*)v5[3] + 1;
- v5[3] = v41;
+ v5[3] = (uint32_t*)v41;
*v41 = BYTE2(v40);
v42 = (int)(v5[6] - 4);
v43 = (uint32_t*)((uint32_t)v5[5] << 16);
@@ -1234,7 +1234,7 @@ int sub_57E4C0(uint32_t** this, unsigned int a2, int a3, unsigned int a4, unsign
*(uint8_t*)v5[3] = (unsigned int)v5[5] >> 24;
v51 = v5[5];
v52 = (char*)v5[3] + 1;
- v5[3] = v52;
+ v5[3] = (uint32_t*)v52;
*v52 = BYTE2(v51);
v53 = (int)(v5[6] - 4);
result = (uint32_t)v5[5] << 16;
@@ -1248,7 +1248,7 @@ int sub_57E4C0(uint32_t** this, unsigned int a2, int a3, unsigned int a4, unsign
//----- (0057D1C0) --------------------------------------------------------
int nxz_compress(void* a1p, uint8_t* a2p, uint8_t* a3p, int a4p) {
void** this = a1p;
- int a2 = a2p;
+ int a2 = (int)a2p;
unsigned char* a3 = a3p;
int a4 = a4p;
void** v4; // ebx
diff --git a/src/legacy/cnxz/nxz_decomp.c b/src/legacy/cnxz/nxz_decomp.c
index 3331fbd959..f13df47657 100644
--- a/src/legacy/cnxz/nxz_decomp.c
+++ b/src/legacy/cnxz/nxz_decomp.c
@@ -466,7 +466,7 @@ uint32_t* sub57E8A0(uint32_t* this) {
v1 = this;
sub57DD90(this);
v2 = calloc(1, sizeof(nxz_table_3));
- v1[33] = v2;
+ v1[33] = (uint32_t)v2;
memcpy(v2, nxz_table_3, sizeof(nxz_table_3));
memcpy(v1 + 1, nxz_table_4, sizeof(nxz_table_4));
return v1;
@@ -477,7 +477,7 @@ uint32_t* sub57E9A0(uint32_t* this) {
uint32_t* v1; // esi
v1 = this;
- *this = calloc(1, 0x10000u);
+ *this = (uint32_t)calloc(1, 0x10000u);
v1[1] = 0;
sub57E8A0(v1 + 2);
v1[37] = 0;
@@ -611,7 +611,7 @@ int nxz_decompress(void* a1p, uint8_t* a2p, int* a3p, uint8_t* a4p, int* a5p) {
uint32_t* this = a1p;
uint8_t* a2 = a2p;
uint32_t* a3 = a3p;
- unsigned int a4 = a4p;
+ unsigned int a4 = (unsigned int)a4p;
uint32_t* a5 = a5p;
unsigned char* v5; // ebp
uint32_t* v6; // ebx
@@ -758,7 +758,7 @@ int nxz_decompress(void* a1p, uint8_t* a2p, int* a3p, uint8_t* a4p, int* a5p) {
return 0;
}
if (v13 == 272) {
- sub57DEA0(v6 + 2, v75);
+ sub57DEA0(v6 + 2, (uint16_t*)v75);
v19 = 0;
v20 = v75;
do {
|