Skip to content

Commit be8d1f7

Browse files
author
Siebren Weertman
committed
Init values in basetypes
Signed-off-by: Siebren Weertman <[email protected]>
1 parent b76f818 commit be8d1f7

File tree

3 files changed

+38
-60
lines changed

3 files changed

+38
-60
lines changed

‎src/input/code_templates/c/static_code/exi_basetypes.h.jinja‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define EXI_STRING_MAX_LEN 64
1717
#define EXI_BYTE_ARRAY_MAX_LEN 350
1818

19-
#define EXI_BASETYPES_MAX_OCTETS_SUPPORTED 20
19+
#define EXI_BASETYPES_MAX_OCTETS_SUPPORTED 25
2020

2121
#define EXI_BASETYPES_OCTET_SEQ_FLAG_MASK 0x80
2222
#define EXI_BASETYPES_OCTET_SEQ_VALUE_MASK 0x7F

‎src/input/code_templates/c/static_code/exi_basetypes_decoder.c.jinja‎

Lines changed: 26 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ static int exi_basetypes_decoder_read_unsigned(exi_bitstream_t* stream, exi_unsi
2121

2222
while (exi_unsigned->octets_count < EXI_BASETYPES_MAX_OCTETS_SUPPORTED)
2323
{
24-
int error;
25-
error = exi_bitstream_read_octet(stream, current_octet);
24+
int error = exi_bitstream_read_octet(stream, current_octet);
2625
if (error != EXI_ERROR__NO_ERROR)
2726
{
2827
return error;
@@ -55,10 +54,10 @@ static int exi_basetypes_decoder_read_unsigned(exi_bitstream_t* stream, exi_unsi
5554
*****************************************************************************/
5655
int exi_basetypes_decoder_bool(exi_bitstream_t* stream, int* value)
5756
{
58-
int error;
59-
uint32_t bit;
57+
uint32_t bit = 0;
58+
59+
int error = exi_bitstream_read_bits(stream, 1, &bit);
6060

61-
error = exi_bitstream_read_bits(stream, 1, &bit);
6261
if (error == EXI_ERROR__NO_ERROR)
6362
{
6463
*value = (bit) ? 1 : 0;
@@ -89,8 +88,7 @@ int exi_basetypes_decoder_bytes(exi_bitstream_t* stream, size_t bytes_len, uint8
8988

9089
for (size_t n = 0; n < bytes_len; n++)
9190
{
92-
int error;
93-
error = exi_bitstream_read_octet(stream, current_byte);
91+
int error = exi_bitstream_read_octet(stream, current_byte);
9492
if (error != EXI_ERROR__NO_ERROR)
9593
{
9694
return error;
@@ -119,11 +117,11 @@ int exi_basetypes_decoder_nbit_uint(exi_bitstream_t* stream, size_t bit_count, u
119117

120118
int exi_basetypes_decoder_uint_8(exi_bitstream_t* stream, uint8_t* value)
121119
{
122-
int error;
123-
exi_unsigned_t exi_unsigned;
124-
uint32_t result;
120+
exi_unsigned_t exi_unsigned = {0};
121+
uint32_t result = 0;
122+
123+
int error = exi_basetypes_decoder_read_unsigned(stream, &exi_unsigned);
125124

126-
error = exi_basetypes_decoder_read_unsigned(stream, &exi_unsigned);
127125
if (error != EXI_ERROR__NO_ERROR)
128126
{
129127
return error;
@@ -149,11 +147,10 @@ int exi_basetypes_decoder_uint_8(exi_bitstream_t* stream, uint8_t* value)
149147

150148
int exi_basetypes_decoder_uint_16(exi_bitstream_t* stream, uint16_t* value)
151149
{
152-
int error;
153-
exi_unsigned_t exi_unsigned;
154-
uint32_t result;
150+
exi_unsigned_t exi_unsigned = {0};
151+
uint32_t result = 0;
155152

156-
error = exi_basetypes_decoder_read_unsigned(stream, &exi_unsigned);
153+
int error = exi_basetypes_decoder_read_unsigned(stream, &exi_unsigned);
157154
if (error != EXI_ERROR__NO_ERROR)
158155
{
159156
return error;
@@ -179,10 +176,9 @@ int exi_basetypes_decoder_uint_16(exi_bitstream_t* stream, uint16_t* value)
179176

180177
int exi_basetypes_decoder_uint_32(exi_bitstream_t* stream, uint32_t* value)
181178
{
182-
int error;
183-
exi_unsigned_t exi_unsigned;
179+
exi_unsigned_t exi_unsigned = {0};
184180

185-
error = exi_basetypes_decoder_read_unsigned(stream, &exi_unsigned);
181+
int error = exi_basetypes_decoder_read_unsigned(stream, &exi_unsigned);
186182
if (error != EXI_ERROR__NO_ERROR)
187183
{
188184
return error;
@@ -206,10 +202,9 @@ int exi_basetypes_decoder_uint_32(exi_bitstream_t* stream, uint32_t* value)
206202

207203
int exi_basetypes_decoder_uint_64(exi_bitstream_t* stream, uint64_t* value)
208204
{
209-
int error;
210-
exi_unsigned_t exi_unsigned;
205+
exi_unsigned_t exi_unsigned = {0};
211206

212-
error = exi_basetypes_decoder_read_unsigned(stream, &exi_unsigned);
207+
int error = exi_basetypes_decoder_read_unsigned(stream, &exi_unsigned);
213208
if (error != EXI_ERROR__NO_ERROR)
214209
{
215210
return error;
@@ -234,10 +229,9 @@ int exi_basetypes_decoder_unsigned(exi_bitstream_t* stream, exi_unsigned_t* valu
234229
*****************************************************************************/
235230
int exi_basetypes_decoder_integer_8(exi_bitstream_t* stream, int8_t* value)
236231
{
237-
int sign;
238-
int error;
232+
int sign = 0;
239233

240-
error = exi_basetypes_decoder_bool(stream, &sign);
234+
int error = exi_basetypes_decoder_bool(stream, &sign);
241235
if (error != EXI_ERROR__NO_ERROR)
242236
{
243237
return error;
@@ -259,10 +253,9 @@ int exi_basetypes_decoder_integer_8(exi_bitstream_t* stream, int8_t* value)
259253

260254
int exi_basetypes_decoder_integer_16(exi_bitstream_t* stream, int16_t* value)
261255
{
262-
int sign;
263-
int error;
256+
int sign = 0;
264257

265-
error = exi_basetypes_decoder_bool(stream, &sign);
258+
int error = exi_basetypes_decoder_bool(stream, &sign);
266259
if (error != EXI_ERROR__NO_ERROR)
267260
{
268261
return error;
@@ -291,10 +284,9 @@ int exi_basetypes_decoder_integer_16(exi_bitstream_t* stream, int16_t* value)
291284

292285
int exi_basetypes_decoder_integer_32(exi_bitstream_t* stream, int32_t* value)
293286
{
294-
int sign;
295-
int error;
287+
int sign = 0;
296288

297-
error = exi_basetypes_decoder_bool(stream, &sign);
289+
int error = exi_basetypes_decoder_bool(stream, &sign);
298290
if (error != EXI_ERROR__NO_ERROR)
299291
{
300292
return error;
@@ -323,10 +315,9 @@ int exi_basetypes_decoder_integer_32(exi_bitstream_t* stream, int32_t* value)
323315

324316
int exi_basetypes_decoder_integer_64(exi_bitstream_t* stream, int64_t* value)
325317
{
326-
int sign;
327-
int error;
318+
int sign = 0;
328319

329-
error = exi_basetypes_decoder_bool(stream, &sign);
320+
int error = exi_basetypes_decoder_bool(stream, &sign);
330321
if (error != EXI_ERROR__NO_ERROR)
331322
{
332323
return error;
@@ -348,10 +339,9 @@ int exi_basetypes_decoder_integer_64(exi_bitstream_t* stream, int64_t* value)
348339

349340
int exi_basetypes_decoder_signed(exi_bitstream_t* stream, exi_signed_t* value)
350341
{
351-
int sign;
352-
int error;
342+
int sign = 0;
353343

354-
error = exi_basetypes_decoder_bool(stream, &sign);
344+
int error = exi_basetypes_decoder_bool(stream, &sign);
355345
if (error != EXI_ERROR__NO_ERROR)
356346
{
357347
return error;

‎src/input/code_templates/c/static_code/exi_basetypes_encoder.c.jinja‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,9 @@ int exi_basetypes_encoder_bool(exi_bitstream_t* stream, int value)
4848
stream->status_callback(EXI_DEBUG__BASETYPES_ENCODE_BOOL, 0, (int)value, 0);
4949
}
5050
{% endif %}
51-
int error;
5251
uint32_t bit = (value) ? 1 : 0;
5352

54-
error = exi_bitstream_write_bits(stream, 1, bit);
53+
int error = exi_bitstream_write_bits(stream, 1, bit);
5554

5655
return error;
5756
}
@@ -76,8 +75,7 @@ int exi_basetypes_encoder_bytes(exi_bitstream_t* stream, size_t bytes_len, const
7675

7776
for (size_t n = 0; n < bytes_len; n++)
7877
{
79-
int error;
80-
error = exi_bitstream_write_octet(stream, *current_byte);
78+
int error = exi_bitstream_write_octet(stream, *current_byte);
8179
if (error != EXI_ERROR__NO_ERROR)
8280
{
8381
return error;
@@ -105,11 +103,10 @@ int exi_basetypes_encoder_uint_8(exi_bitstream_t* stream, uint8_t value)
105103
stream->status_callback(EXI_DEBUG__BASETYPES_ENCODE_UINT_8, 0, (int)value, 0);
106104
}
107105
{% endif %}
108-
int error;
109106
exi_unsigned_t exi_unsigned;
110107
uint32_t result = (uint32_t)value;
111108

112-
error = exi_basetypes_convert_to_unsigned(&exi_unsigned, result, EXI_BASETYPES_UINT8_MAX_OCTETS);
109+
int error = exi_basetypes_convert_to_unsigned(&exi_unsigned, result, EXI_BASETYPES_UINT8_MAX_OCTETS);
113110
if (error != EXI_ERROR__NO_ERROR)
114111
{
115112
return error;
@@ -126,11 +123,10 @@ int exi_basetypes_encoder_uint_16(exi_bitstream_t* stream, uint16_t value)
126123
stream->status_callback(EXI_DEBUG__BASETYPES_ENCODE_UINT_16, 0, (int)value, 0);
127124
}
128125
{% endif %}
129-
int error;
130126
exi_unsigned_t exi_unsigned;
131127
uint32_t result = (uint32_t)value;
132128

133-
error = exi_basetypes_convert_to_unsigned(&exi_unsigned, result, EXI_BASETYPES_UINT16_MAX_OCTETS);
129+
int error = exi_basetypes_convert_to_unsigned(&exi_unsigned, result, EXI_BASETYPES_UINT16_MAX_OCTETS);
134130
if (error != EXI_ERROR__NO_ERROR)
135131
{
136132
return error;
@@ -147,10 +143,9 @@ int exi_basetypes_encoder_uint_32(exi_bitstream_t* stream, uint32_t value)
147143
stream->status_callback(EXI_DEBUG__BASETYPES_ENCODE_UINT_32, 0, (int)value, 0);
148144
}
149145
{% endif %}
150-
int error;
151146
exi_unsigned_t exi_unsigned;
152147

153-
error = exi_basetypes_convert_to_unsigned(&exi_unsigned, value, EXI_BASETYPES_UINT32_MAX_OCTETS);
148+
int error = exi_basetypes_convert_to_unsigned(&exi_unsigned, value, EXI_BASETYPES_UINT32_MAX_OCTETS);
154149
if (error != EXI_ERROR__NO_ERROR)
155150
{
156151
return error;
@@ -161,10 +156,9 @@ int exi_basetypes_encoder_uint_32(exi_bitstream_t* stream, uint32_t value)
161156

162157
int exi_basetypes_encoder_uint_64(exi_bitstream_t* stream, uint64_t value)
163158
{
164-
int error;
165159
exi_unsigned_t exi_unsigned;
166160

167-
error = exi_basetypes_convert_64_to_unsigned(&exi_unsigned, value);
161+
int error = exi_basetypes_convert_64_to_unsigned(&exi_unsigned, value);
168162
if (error != EXI_ERROR__NO_ERROR)
169163
{
170164
return error;
@@ -189,10 +183,9 @@ int exi_basetypes_encoder_integer_8(exi_bitstream_t* stream, int8_t value)
189183
stream->status_callback(EXI_DEBUG__BASETYPES_ENCODE_INT_8, 0, (int)value, 0);
190184
}
191185
{% endif %}
192-
int error;
193186
int sign = (value < 0) ? 1 : 0;
194187

195-
error = exi_basetypes_encoder_bool(stream, sign);
188+
int error = exi_basetypes_encoder_bool(stream, sign);
196189
if (error != EXI_ERROR__NO_ERROR)
197190
{
198191
return error;
@@ -216,10 +209,9 @@ int exi_basetypes_encoder_integer_16(exi_bitstream_t* stream, int16_t value)
216209
stream->status_callback(EXI_DEBUG__BASETYPES_ENCODE_INT_16, 0, (int)value, 0);
217210
}
218211
{% endif %}
219-
int error;
220212
int sign = (value < 0) ? 1 : 0;
221213

222-
error = exi_basetypes_encoder_bool(stream, sign);
214+
int error = exi_basetypes_encoder_bool(stream, sign);
223215
if (error != EXI_ERROR__NO_ERROR)
224216
{
225217
return error;
@@ -243,10 +235,9 @@ int exi_basetypes_encoder_integer_32(exi_bitstream_t* stream, int32_t value)
243235
stream->status_callback(EXI_DEBUG__BASETYPES_ENCODE_INT_32, 0, (int)value, 0);
244236
}
245237
{% endif %}
246-
int error;
247238
int sign = (value < 0) ? 1 : 0;
248239

249-
error = exi_basetypes_encoder_bool(stream, sign);
240+
int error = exi_basetypes_encoder_bool(stream, sign);
250241
if (error != EXI_ERROR__NO_ERROR)
251242
{
252243
return error;
@@ -264,10 +255,9 @@ int exi_basetypes_encoder_integer_32(exi_bitstream_t* stream, int32_t value)
264255

265256
int exi_basetypes_encoder_integer_64(exi_bitstream_t* stream, int64_t value)
266257
{
267-
int error;
268258
int sign = (value < 0) ? 1 : 0;
269259

270-
error = exi_basetypes_encoder_bool(stream, sign);
260+
int error = exi_basetypes_encoder_bool(stream, sign);
271261
if (error != EXI_ERROR__NO_ERROR)
272262
{
273263
return error;
@@ -285,9 +275,7 @@ int exi_basetypes_encoder_integer_64(exi_bitstream_t* stream, int64_t value)
285275

286276
int exi_basetypes_encoder_signed(exi_bitstream_t* stream, const exi_signed_t* value)
287277
{
288-
int error;
289-
290-
error = exi_basetypes_encoder_bool(stream, value->is_negative);
278+
int error = exi_basetypes_encoder_bool(stream, value->is_negative);
291279
if (error != EXI_ERROR__NO_ERROR)
292280
{
293281
return error;

0 commit comments

Comments
 (0)