Skip to content

Fix. return correct error from some functions #81

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

Merged
merged 1 commit into from
Sep 29, 2016
Merged

Fix. return correct error from some functions #81

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/lceasy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ static int lcurl_easy_escape(lua_State *L){
size_t data_size; const char *data = luaL_checklstring(L, 2, &data_size);
const char *ret = curl_easy_escape(p->curl, data, (int)data_size);
if(!ret){
lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_EASY, CURLE_OUT_OF_MEMORY);
return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_EASY, CURLE_OUT_OF_MEMORY);
}
lua_pushstring(L, ret);
curl_free((char*)ret);
Expand All @@ -225,7 +225,7 @@ static int lcurl_easy_unescape(lua_State *L){
size_t data_size; const char *data = luaL_checklstring(L, 2, &data_size);
int ret_size; const char *ret = curl_easy_unescape(p->curl, data, (int)data_size, &ret_size);
if(!ret){
lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_EASY, CURLE_OUT_OF_MEMORY);
return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_EASY, CURLE_OUT_OF_MEMORY);
}
lua_pushlstring(L, ret, ret_size);
curl_free((char*)ret);
Expand Down
12 changes: 6 additions & 6 deletions src/lcmulti.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ static int lcurl_multi_perform(lua_State *L){
lcurl__multi_assign_lua(L, p, curL, 1);

if(code != CURLM_OK){
lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
}
lua_pushnumber(L, running_handles);
return 1;
Expand Down Expand Up @@ -312,7 +312,7 @@ static int lcurl_multi_wait(lua_State *L){
if(lua_isnoneornil(L, 2)){
code = curl_multi_timeout(p->curl, &ms);
if(code != CURLM_OK){
lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
}
}
else{
Expand All @@ -332,7 +332,7 @@ static int lcurl_multi_wait(lua_State *L){
//! @todo supports extra_fds
code = curl_multi_wait(p->curl, 0, 0, ms, &maxfd);
if(code != CURLM_OK){
lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
}
lua_pushnumber(L, maxfd);
return 1;
Expand All @@ -346,7 +346,7 @@ static int lcurl_multi_wait(lua_State *L){

code = curl_multi_fdset(p->curl, &fdread, &fdwrite, &fdexcep, &maxfd);
if(code != CURLM_OK){
lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
}

//if(maxfd > 0)
Expand All @@ -372,7 +372,7 @@ static int lcurl_multi_timeout(lua_State *L){
long n;
CURLMcode code = curl_multi_timeout(p->curl, &n);
if(code != CURLM_OK){
lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
}
lua_pushnumber(L, n);
return 1;
Expand All @@ -395,7 +395,7 @@ static int lcurl_multi_socket_action(lua_State *L){
lcurl__multi_assign_lua(L, p, curL, 1);

if(code != CURLM_OK){
lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
}
lua_pushinteger(L, n);
return 1;
Expand Down