Handle the schema registry url ending with '/' #38
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
edenhill
suggested changes
Jan 12, 2021
src/rest.c
Outdated
| * the last redundant '/' in the url. | ||
| */ | ||
| url_len = strlen(ul->urls[ul->idx]); | ||
| if (url_len > 0 && ul->urls[ul->idx][url_len - 1] == '/') |
There was a problem hiding this comment.
suggest removing all trailing slashes:
while (url_len > 0 && ..urls[url_len-1] == '/')
url_len--; There was a problem hiding this comment.
Good suggestion.
src/rest.c
Outdated
| url_len = strlen(ul->urls[ul->idx]); | ||
| if (url_len > 0 && ul->urls[ul->idx][url_len - 1] == '/') | ||
| url_len --; | ||
| snprintf(tmpurl, url_len + 1, "%s", ul->urls[ul->idx]); |
There was a problem hiding this comment.
I think this can be simplified by passing the string length:
sprintf(tmpurl, "%.*s%s", (int)url_len, ul->urls[ul->idx], url_path);
edenhill
reviewed
Jan 12, 2021
src/rest.c
Outdated
| @@ -372,6 +372,7 @@ static rest_response_t *rest_req (url_list_t *ul, rest_cmd_t cmd, | |||
| int url_path_len; | |||
| va_list ap2; | |||
| const int debug = 0; | |||
| size_t url_len; | |||
There was a problem hiding this comment.
move this down to the blcok where it is used (the do { block)
edenhill
suggested changes
Jan 13, 2021
src/rest.c
Outdated
| @@ -433,17 +432,17 @@ static rest_response_t *rest_req (url_list_t *ul, rest_cmd_t cmd, | |||
| ccode = CURLE_URL_MALFORMAT; | |||
| tmpurl = alloca(ul->max_len + 1 + strlen(url_path) + 1); | |||
| start_idx = ul->idx; | |||
| size_t url_len; | |||
There was a problem hiding this comment.
it should go at the beginning of the do { block:
do {
size_t url_len = strlen(...);
src/rest.c
Outdated
| url_len --; | ||
| snprintf(tmpurl, url_len + 1, "%s", ul->urls[ul->idx]); | ||
| sprintf(tmpurl + url_len, "%s", url_path); | ||
| sprintf(tmpurl, "%.*s%s", url_len, ul->urls[ul->idx], url_path); |
There was a problem hiding this comment.
need to cast url_len to int
edenhill
suggested changes
Jan 13, 2021
src/rest.c
Outdated
| @@ -433,10 +433,18 @@ static rest_response_t *rest_req (url_list_t *ul, rest_cmd_t cmd, | |||
| tmpurl = alloca(ul->max_len + 1 + strlen(url_path) + 1); | |||
| start_idx = ul->idx; | |||
| do { | |||
| sprintf(tmpurl, "%s%s", ul->urls[ul->idx], url_path); | |||
| /* Hanld the '/' in url | |||
|
[clabot:check] |
|
@confluentinc It looks like @fanfuxiaoran just signed our Contributor License Agreement. 👍 Always at your service, clabot |
|
Thank you! |
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.
No description provided.