Skip to content

Commit 066f673

Browse files
committed
Fix. return correct error from some functions
1 parent c5e4734 commit 066f673

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/lceasy.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ static int lcurl_easy_escape(lua_State *L){
213213
size_t data_size; const char *data = luaL_checklstring(L, 2, &data_size);
214214
const char *ret = curl_easy_escape(p->curl, data, (int)data_size);
215215
if(!ret){
216-
lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_EASY, CURLE_OUT_OF_MEMORY);
216+
return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_EASY, CURLE_OUT_OF_MEMORY);
217217
}
218218
lua_pushstring(L, ret);
219219
curl_free((char*)ret);
@@ -225,7 +225,7 @@ static int lcurl_easy_unescape(lua_State *L){
225225
size_t data_size; const char *data = luaL_checklstring(L, 2, &data_size);
226226
int ret_size; const char *ret = curl_easy_unescape(p->curl, data, (int)data_size, &ret_size);
227227
if(!ret){
228-
lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_EASY, CURLE_OUT_OF_MEMORY);
228+
return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_EASY, CURLE_OUT_OF_MEMORY);
229229
}
230230
lua_pushlstring(L, ret, ret_size);
231231
curl_free((char*)ret);

src/lcmulti.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ static int lcurl_multi_perform(lua_State *L){
252252
lcurl__multi_assign_lua(L, p, curL, 1);
253253

254254
if(code != CURLM_OK){
255-
lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
255+
return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
256256
}
257257
lua_pushnumber(L, running_handles);
258258
return 1;
@@ -312,7 +312,7 @@ static int lcurl_multi_wait(lua_State *L){
312312
if(lua_isnoneornil(L, 2)){
313313
code = curl_multi_timeout(p->curl, &ms);
314314
if(code != CURLM_OK){
315-
lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
315+
return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
316316
}
317317
}
318318
else{
@@ -332,7 +332,7 @@ static int lcurl_multi_wait(lua_State *L){
332332
//! @todo supports extra_fds
333333
code = curl_multi_wait(p->curl, 0, 0, ms, &maxfd);
334334
if(code != CURLM_OK){
335-
lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
335+
return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
336336
}
337337
lua_pushnumber(L, maxfd);
338338
return 1;
@@ -346,7 +346,7 @@ static int lcurl_multi_wait(lua_State *L){
346346

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

352352
//if(maxfd > 0)
@@ -372,7 +372,7 @@ static int lcurl_multi_timeout(lua_State *L){
372372
long n;
373373
CURLMcode code = curl_multi_timeout(p->curl, &n);
374374
if(code != CURLM_OK){
375-
lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
375+
return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
376376
}
377377
lua_pushnumber(L, n);
378378
return 1;
@@ -395,7 +395,7 @@ static int lcurl_multi_socket_action(lua_State *L){
395395
lcurl__multi_assign_lua(L, p, curL, 1);
396396

397397
if(code != CURLM_OK){
398-
lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
398+
return lcurl_fail_ex(L, p->err_mode, LCURL_ERROR_MULTI, code);
399399
}
400400
lua_pushinteger(L, n);
401401
return 1;

0 commit comments

Comments
 (0)