jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-08-05 18:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
J. Nick Koston 2025-07-10 12:33:33 -10:00
parent 5372bcb2b8
commit d27a938f74
No known key found for this signature in database
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
esphome/components/api/proto.h
View File

@ -78,7 +78,7 @@ constexpr uint8_t get_wire_type(ProtoFieldType type) {
// Macro to calculate field offset without triggering -Winvalid-offsetof // Macro to calculate field offset without triggering -Winvalid-offsetof
// This uses the same approach as offsetof but with explicit reinterpret_cast // This uses the same approach as offsetof but with explicit reinterpret_cast
#define PROTO_FIELD_OFFSET(Type, Member) \ #define PROTO_FIELD_OFFSET(Type, Member) \
static_cast<uint16_t>(reinterpret_cast<size_t>(&reinterpret_cast<Type *>(16)->Member) - 16) static_cast<uint16_t>(reinterpret_cast<size_t>(&reinterpret_cast<(Type) *>(16)->Member) - 16)
/// Representation of a VarInt - in ProtoBuf should be 64bit but we only use 32bit /// Representation of a VarInt - in ProtoBuf should be 64bit but we only use 32bit
class ProtoVarInt { class ProtoVarInt {
@ -512,17 +512,13 @@ class ProtoMessage {
void decode(const uint8_t *buffer, size_t length); void decode(const uint8_t *buffer, size_t length);
void calculate_size(uint32_t &total_size) const; void calculate_size(uint32_t &total_size) const;
protected:
// V3 implementations
void encode_v3(ProtoWriteBuffer buffer) const;
void decode_v3(const uint8_t *buffer, size_t length);
void calculate_size_v3(uint32_t &total_size) const;
#ifdef HAS_PROTO_MESSAGE_DUMP #ifdef HAS_PROTO_MESSAGE_DUMP
std::string dump() const; std::string dump() const;
virtual void dump_to(std::string &out) const = 0; virtual void dump_to(std::string &out) const = 0;
virtual const char *message_name() const { return "unknown"; } virtual const char *message_name() const { return "unknown"; }
#endif #endif
protected:
}; };
template<typename T> const char *proto_enum_to_string(T value); template<typename T> const char *proto_enum_to_string(T value);
@ -609,12 +605,6 @@ void size_message_field(uint32_t &total_size, const void *field_ptr, uint8_t pre
// Template decode functions removed - V3 inlines decoding directly // Template decode functions removed - V3 inlines decoding directly
template<typename MessageType>
void encode_repeated_message_field(ProtoWriteBuffer &buffer, const void *field_ptr, uint8_t field_num);
template<typename MessageType>
void size_repeated_message_field(uint32_t &total_size, const void *field_ptr, uint8_t precalced_field_id_size);
// Core shared functions removed - V2 metadata is used directly // Core shared functions removed - V2 metadata is used directly
} // namespace api } // namespace api