chore: reuse existing functions for calculating protocol fragment #402
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
XavierChanth
commented
Sep 20, 2024
Comment on lines
-1202
to
+1203
| const size_t metadata_str_size = atclient_atkey_metadata_protocol_strlen(metadata) + 1; | ||
| const size_t expected_metadatastr_len = metadata_str_size - 1; | ||
| const size_t expected_metadatastr_len = atclient_atkey_metadata_protocol_strlen(metadata); | ||
| const size_t metadata_str_size = expected_metadatastr_len + 1; |
There was a problem hiding this comment.
flipped these variables so we don't have to +1 then -1
XavierChanth
commented
Sep 20, 2024
Comment on lines
-1213
to
+1215
| sprintf(*metadata_str + pos, ":ttl:%ld", metadata->ttl); | ||
| pos += 5 + atclient_string_utils_long_strlen(metadata->ttl); | ||
| sprintf((*metadata_str) + pos, ":ttl:%ld", metadata->ttl); | ||
| pos += atclient_atkey_metadata_ttl_strlen(metadata); |
There was a problem hiding this comment.
pattern 1: drop in replacement of manual calculation for the method
XavierChanth
commented
Sep 20, 2024
Comment on lines
1229
to
+1234
| if (metadata->ccd) { | ||
| sprintf(*metadata_str + pos, ":ccd:true"); | ||
| pos += 9; | ||
| sprintf((*metadata_str) + pos, ":ccd:true"); | ||
| } else { | ||
| sprintf(*metadata_str + pos, ":ccd:false"); | ||
| pos += 10; | ||
| sprintf((*metadata_str) + pos, ":ccd:false"); | ||
| } | ||
| pos += atclient_atkey_metadata_ccd_strlen(metadata); |
There was a problem hiding this comment.
pattern 2: we internally call this same if statement inside atclient_atkey_metadata_<thing>_strlen for all boolean metadata strlen functions, so we can consolidate the pos calculation by moving it outside the if/else
XavierChanth
commented
Sep 20, 2024
Comment on lines
+1315
to
+1319
| atlogger_log(TAG, ATLOGGER_LOGGING_LEVEL_ERROR, | ||
| "metadata_str length mismatch: %lu != %lu\nmetadata:", strlen(*metadata_str), | ||
| (expected_metadatastr_len)); | ||
|
|
||
| atlogger_log(TAG, ATLOGGER_LOGGING_LEVEL_ERROR, "metadata_str: %s\n", (*metadata_str)); |
There was a problem hiding this comment.
Added some more logging in case this comes up again
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
- What I did
We have methods to calculate the string length of individual metadata fragments, as well as the entire metadata fragment. (fragment as in fragment of an at_protocol verb)
I replaced implementation in the function for calculating entire string length with calls to the individual functions instead of doing each calculation manually.
- How I did it
- How to verify it
See atsign-foundation/noports#1363
- Description for the changelog
chore: reuse existing functions for calculating protocol fragment