Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for #4866 - inconsistent arguments #6639

Merged
merged 3 commits into from
Apr 29, 2024
Merged

Conversation

clydebarrow
Copy link
Contributor

What does this implement/fix?

#4866 introduced some new functions, unfortunately the declaration and definition of one were inconsistent:

helpers.h:

std::string base64_encode(const uint8_t *buf, size_t buf_len);

vs helpers.cpp:

std::string base64_encode(const char *buf, unsigned int buf_len) {

This PR makes those consistent, and also fixes a couple of printf formats for size_t.

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Other

Related issue or feature (if applicable): fixes

Pull request in esphome-docs with documentation (if applicable): esphome/esphome-docs#

Test Environment

  • ESP32
  • ESP32 IDF
  • ESP8266
  • RP2040
  • BK72xx
  • RTL87xx
  • host

Example entry for config.yaml:

# Example config.yaml

Checklist:

  • The code change is tested and works locally.
  • Tests have been added to verify that the new code works (under tests/ folder).

If user exposed functionality or configuration variables are added/changed:

@probot-esphome
Copy link

Hey there @esphome/core, mind taking a look at this pull request as it has been labeled with an integration (binary_sensor) you are listed as a code owner for? Thanks!
(message by CodeOwnersMention)

@codecov-commenter
Copy link

codecov-commenter commented Apr 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 53.46%. Comparing base (4d8b5ed) to head (3a6d368).
Report is 480 commits behind head on dev.

Additional details and impacted files
@@            Coverage Diff             @@
##              dev    #6639      +/-   ##
==========================================
- Coverage   53.70%   53.46%   -0.25%     
==========================================
  Files          50       50              
  Lines        9408     9545     +137     
  Branches     1654     1685      +31     
==========================================
+ Hits         5053     5103      +50     
- Misses       4056     4132      +76     
- Partials      299      310      +11     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@jesserockz jesserockz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Woops, thanks for fixing

@jesserockz jesserockz merged commit c007593 into esphome:dev Apr 29, 2024
65 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators May 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants