Skip to content

Commit d30f2ab

Browse files
mike-scottnashif
authored andcommitted
net: lwm2m: fix formatter reader/writer initialization syntax
For ease of maintenance, let's swap the reader/writer initialization syntax to: .put_begin = put_begin, .put_end = put_end, ... This way we only assign used fields and adding new ones later is less error prone. Signed-off-by: Michael Scott <[email protected]>
1 parent e426116 commit d30f2ab

File tree

3 files changed

+46
-65
lines changed

3 files changed

+46
-65
lines changed

subsys/net/lib/lwm2m/lwm2m_rw_json.c

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -506,23 +506,18 @@ static size_t put_bool(struct lwm2m_output_context *out,
506506
}
507507

508508
const struct lwm2m_writer json_writer = {
509-
put_begin,
510-
put_end,
511-
NULL,
512-
NULL,
513-
NULL,
514-
NULL,
515-
put_begin_ri,
516-
put_end_ri,
517-
put_s8,
518-
put_s16,
519-
put_s32,
520-
put_s64,
521-
put_string,
522-
put_float32fix,
523-
put_float64fix,
524-
put_bool,
525-
NULL
509+
.put_begin = put_begin,
510+
.put_end = put_end,
511+
.put_begin_ri = put_begin_ri,
512+
.put_end_ri = put_end_ri,
513+
.put_s8 = put_s8,
514+
.put_s16 = put_s16,
515+
.put_s32 = put_s32,
516+
.put_s64 = put_s64,
517+
.put_string = put_string,
518+
.put_float32fix = put_float32fix,
519+
.put_float64fix = put_float64fix,
520+
.put_bool = put_bool,
526521
};
527522

528523
int do_read_op_json(struct lwm2m_engine_obj *obj,

subsys/net/lib/lwm2m/lwm2m_rw_oma_tlv.c

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -785,33 +785,28 @@ static size_t get_opaque(struct lwm2m_input_context *in,
785785
}
786786

787787
const struct lwm2m_writer oma_tlv_writer = {
788-
NULL,
789-
NULL,
790-
put_begin_oi,
791-
put_end_oi,
792-
NULL,
793-
NULL,
794-
put_begin_ri,
795-
put_end_ri,
796-
put_s8,
797-
put_s16,
798-
put_s32,
799-
put_s64,
800-
put_string,
801-
put_float32fix,
802-
put_float64fix,
803-
put_bool,
804-
NULL
788+
.put_begin_oi = put_begin_oi,
789+
.put_end_oi = put_end_oi,
790+
.put_begin_ri = put_begin_ri,
791+
.put_end_ri = put_end_ri,
792+
.put_s8 = put_s8,
793+
.put_s16 = put_s16,
794+
.put_s32 = put_s32,
795+
.put_s64 = put_s64,
796+
.put_string = put_string,
797+
.put_float32fix = put_float32fix,
798+
.put_float64fix = put_float64fix,
799+
.put_bool = put_bool,
805800
};
806801

807802
const struct lwm2m_reader oma_tlv_reader = {
808-
get_s32,
809-
get_s64,
810-
get_string,
811-
get_float32fix,
812-
get_float64fix,
813-
get_bool,
814-
get_opaque
803+
.get_s32 = get_s32,
804+
.get_s64 = get_s64,
805+
.get_string = get_string,
806+
.get_float32fix = get_float32fix,
807+
.get_float64fix = get_float64fix,
808+
.get_bool = get_bool,
809+
.get_opaque = get_opaque,
815810
};
816811

817812
int do_read_op_tlv(struct lwm2m_engine_obj *obj,

subsys/net/lib/lwm2m/lwm2m_rw_plain_text.c

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -310,33 +310,24 @@ static size_t get_opaque(struct lwm2m_input_context *in,
310310
}
311311

312312
const struct lwm2m_writer plain_text_writer = {
313-
NULL,
314-
NULL,
315-
NULL,
316-
NULL,
317-
NULL,
318-
NULL,
319-
NULL,
320-
NULL,
321-
put_s8,
322-
put_s16,
323-
put_s32,
324-
put_s64,
325-
put_string,
326-
put_float32fix,
327-
put_float64fix,
328-
put_bool,
329-
NULL
313+
.put_s8 = put_s8,
314+
.put_s16 = put_s16,
315+
.put_s32 = put_s32,
316+
.put_s64 = put_s64,
317+
.put_string = put_string,
318+
.put_float32fix = put_float32fix,
319+
.put_float64fix = put_float64fix,
320+
.put_bool = put_bool,
330321
};
331322

332323
const struct lwm2m_reader plain_text_reader = {
333-
get_s32,
334-
get_s64,
335-
get_string,
336-
get_float32fix,
337-
get_float64fix,
338-
get_bool,
339-
get_opaque
324+
.get_s32 = get_s32,
325+
.get_s64 = get_s64,
326+
.get_string = get_string,
327+
.get_float32fix = get_float32fix,
328+
.get_float64fix = get_float64fix,
329+
.get_bool = get_bool,
330+
.get_opaque = get_opaque,
340331
};
341332

342333
int do_read_op_plain_text(struct lwm2m_engine_obj *obj,

0 commit comments

Comments
 (0)