Skip to content

feat: remove defer to improve UT #23

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.

Sign up for GitHub

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

Open
zymxxxs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: remove defer to improve UT #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions YMHTTP/curl/YMEasyHandle.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ - (void)updatePauseState:(YMEasyHandlePauseState)pauseState {
NSUInteger send = pauseState & YMEasyHandlePauseStateSend;
NSUInteger receive = pauseState & YMEasyHandlePauseStateReceive;
int bitmask = 0 | (send ? CURLPAUSE_SEND : CURLPAUSE_SEND_CONT) | (receive ? CURLPAUSE_RECV : CURLPAUSE_RECV_CONT);
YM_ECODE(curl_easy_pause(self.rawHandle, bitmask));
int code = curl_easy_pause(self.rawHandle, bitmask);
YM_ECODE(code);

// https://curl.haxx.se/libcurl/c/curl_easy_pause.html
// Starting in libcurl 7.32.0, unpausing a transfer will schedule a timeout trigger for that handle 1 millisecond
Expand Down Expand Up @@ -417,36 +418,32 @@ - (void)setCookiesWithHeaderData:(NSData *)data {
size_t _curl_write_function(char *data, size_t size, size_t nmemb, void *userdata) {
YMEasyHandle *handle = from(userdata);
if (!handle) return 0;

@YM_DEFER {
[handle resetTimer];
};

return [handle didReceiveData:data size:size nmemb:nmemb];

size_t code = [handle didReceiveData:data size:size nmemb:nmemb];
[handle resetTimer];

return code;
}

size_t _curl_read_function(char *data, size_t size, size_t nmemb, void *userdata) {
YMEasyHandle *handle = from(userdata);
if (!handle) return 0;

@YM_DEFER {
[handle resetTimer];
};

return [handle fillWriteBuffer:data size:size nmemb:nmemb];
size_t code = [handle fillWriteBuffer:data size:size nmemb:nmemb];
[handle resetTimer];

return code;
}

size_t _curl_header_function(char *data, size_t size, size_t nmemb, void *userdata) {
YMEasyHandle *handle = from(userdata);
if (!handle) return 0;

@YM_DEFER {
[handle resetTimer];
};

double length;
YM_ECODE(curl_easy_getinfo(handle.rawHandle, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &length));
return [handle didReceiveHeaderData:data size:size nmemb:nmemb contentLength:length];
size_t code = [handle didReceiveHeaderData:data size:size nmemb:nmemb contentLength:length];
[handle resetTimer];
return code;
}

int _curl_seek_function(void *userdata, curl_off_t offset, int origin) {
Expand Down