bluetooth: avdtp: avoid that the ret and err exist together #87056
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
zephyrbot
added
area: Bluetooth
area: Bluetooth Classic
jhedberg
requested changes
Mar 13, 2025
Comment on lines
428
to
431
| int ret; | ||
| int l2cap_ret; | ||
| struct bt_avdtp_sep *sep; | ||
| struct net_buf *rsp_buf; | ||
| uint8_t error_code = 0; |
There was a problem hiding this comment.
It's actually worse, since you have three error variables here with error_code included. I think you should be able to remove l2cap_ret completely and just reuse err when you need to store the value from l2cap_chan_send(). I'd also rename error_code to avdtp_err. At the end of the function when you need to decide about the state change, you shouldn't need to look at err at all, rather !reconfig && avdtp_err == 0 is all that you need.
There was a problem hiding this comment.
Remove l2cap_ret. Change error_code as avdtp_err_code, keep code in the variable because the avdtp spec say it as ERROR_CODE.
Keep the err in code as it is convention in Bluetooth code, remove ret, change error_code as avdtp_err_code for avdtp protocol error. Signed-off-by: Mark Wang <yichang.wang@nxp.com>
MarkWangChinese
force-pushed
the
feature/avdtp_optimze_for_more_readable
branch
from
c703237 to
3bb68b0
Compare
jhedberg
approved these changes
Mar 18, 2025
lylezhu2012
approved these changes
Mar 21, 2025
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.
Keep the err in code as it is convention in Bluetooth code, change ret as l2cap_ret because it is the return value of l2cap send function.