From 28b74e777c73f5e72148aa0cc043b5fa4f6965d1 Mon Sep 17 00:00:00 2001
From: Alina Lenk <alina.v.lenk@gmail.com>
Date: Mon, 4 Jul 2022 19:08:39 +0200
Subject: [PATCH 2/2] generate_packets.py: Remove city_map references
See osdn#45012
Signed-off-by: Alina Lenk <alina.v.lenk@gmail.com>
---
common/generate_packets.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/common/generate_packets.py b/common/generate_packets.py
index f8bbaf5e51..2f48ccf4ad 100755
--- a/common/generate_packets.py
+++ b/common/generate_packets.py
@@ -653,7 +653,7 @@ e |= DIO_PUT({self.dataio_type}, &dout, &field_addr, &real_packet->{self.name});
e |= DIO_PUT({self.dataio_type}, &dout, &field_addr, &real_packet->{self.name}, {self.array_size_u});
""".format(self = self)
- arr_types=["string","estring","city_map"]
+ arr_types = ["string", "estring"]
if (self.dataio_type in arr_types and self.is_array==1) or \
(self.dataio_type not in arr_types and self.is_array==0):
return """\
@@ -891,8 +891,7 @@ if (!DIO_BV_GET(&din, &field_addr, real_packet->{self.name})) {{
RECEIVE_PACKET_FIELD_ERROR({self.name});
}}
""".format(self = self)
- if self.dataio_type in ["string","estring","city_map"] and \
- self.is_array!=2:
+ if self.dataio_type in ["string", "estring"] and self.is_array != 2:
return """\
if (!DIO_GET({self.dataio_type}, &din, &field_addr, real_packet->{self.name}, sizeof(real_packet->{self.name}))) {{
RECEIVE_PACKET_FIELD_ERROR({self.name});
--
2.34.1