dany/luasocket
1
0
Fork 0
mirror of https://github.com/lunarmodules/luasocket.git synced 2024-12-26 12:28:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #119 from gatzka/master

Browse Source 
Make casts const correct.
This commit is contained in:
Diego Nehab 2015-03-03 19:01:00 -03:00
commit bbcbbf845e
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mime.c
View File

@ -111,7 +111,7 @@ static int mime_global_wrp(lua_State *L)
{ {
size_t size = 0; size_t size = 0;
int left = (int) luaL_checknumber(L, 1); int left = (int) luaL_checknumber(L, 1);
const UC *input = (UC *) luaL_optlstring(L, 2, NULL, &size); const UC *input = (const UC *) luaL_optlstring(L, 2, NULL, &size);
const UC *last = input + size; const UC *last = input + size;
int length = (int) luaL_optnumber(L, 3, 76); int length = (int) luaL_optnumber(L, 3, 76);
luaL_Buffer buffer; luaL_Buffer buffer;
@ -259,7 +259,7 @@ static int mime_global_b64(lua_State *L)
{ {
UC atom[3]; UC atom[3];
size_t isize = 0, asize = 0; size_t isize = 0, asize = 0;
const UC *input = (UC *) luaL_optlstring(L, 1, NULL, &isize); const UC *input = (const UC *) luaL_optlstring(L, 1, NULL, &isize);
const UC *last = input + isize; const UC *last = input + isize;
luaL_Buffer buffer; luaL_Buffer buffer;
/* end-of-input blackhole */ /* end-of-input blackhole */
@ -274,7 +274,7 @@ static int mime_global_b64(lua_State *L)
luaL_buffinit(L, &buffer); luaL_buffinit(L, &buffer);
while (input < last) while (input < last)
asize = b64encode(*input++, atom, asize, &buffer); asize = b64encode(*input++, atom, asize, &buffer);
input = (UC *) luaL_optlstring(L, 2, NULL, &isize); input = (const UC *) luaL_optlstring(L, 2, NULL, &isize);
/* if second part is nil, we are done */ /* if second part is nil, we are done */
if (!input) { if (!input) {
size_t osize = 0; size_t osize = 0;
@ -305,7 +305,7 @@ static int mime_global_unb64(lua_State *L)
{ {
UC atom[4]; UC atom[4];
size_t isize = 0, asize = 0; size_t isize = 0, asize = 0;
const UC *input = (UC *) luaL_optlstring(L, 1, NULL, &isize); const UC *input = (const UC *) luaL_optlstring(L, 1, NULL, &isize);
const UC *last = input + isize; const UC *last = input + isize;
luaL_Buffer buffer; luaL_Buffer buffer;
/* end-of-input blackhole */ /* end-of-input blackhole */
@ -320,7 +320,7 @@ static int mime_global_unb64(lua_State *L)
luaL_buffinit(L, &buffer); luaL_buffinit(L, &buffer);
while (input < last) while (input < last)
asize = b64decode(*input++, atom, asize, &buffer); asize = b64decode(*input++, atom, asize, &buffer);
input = (UC *) luaL_optlstring(L, 2, NULL, &isize); input = (const UC *) luaL_optlstring(L, 2, NULL, &isize);
/* if second is nil, we are done */ /* if second is nil, we are done */
if (!input) { if (!input) {
size_t osize = 0; size_t osize = 0;
@ -457,7 +457,7 @@ static int mime_global_qp(lua_State *L)
size_t asize = 0, isize = 0; size_t asize = 0, isize = 0;
UC atom[3]; UC atom[3];
const UC *input = (UC *) luaL_optlstring(L, 1, NULL, &isize); const UC *input = (const UC *) luaL_optlstring(L, 1, NULL, &isize);
const UC *last = input + isize; const UC *last = input + isize;
const char *marker = luaL_optstring(L, 3, CRLF); const char *marker = luaL_optstring(L, 3, CRLF);
luaL_Buffer buffer; luaL_Buffer buffer;
@ -473,7 +473,7 @@ static int mime_global_qp(lua_State *L)
luaL_buffinit(L, &buffer); luaL_buffinit(L, &buffer);
while (input < last) while (input < last)
asize = qpencode(*input++, atom, asize, marker, &buffer); asize = qpencode(*input++, atom, asize, marker, &buffer);
input = (UC *) luaL_optlstring(L, 2, NULL, &isize); input = (const UC *) luaL_optlstring(L, 2, NULL, &isize);
/* if second part is nil, we are done */ /* if second part is nil, we are done */
if (!input) { if (!input) {
asize = qppad(atom, asize, &buffer); asize = qppad(atom, asize, &buffer);
@ -533,7 +533,7 @@ static int mime_global_unqp(lua_State *L)
{ {
size_t asize = 0, isize = 0; size_t asize = 0, isize = 0;
UC atom[3]; UC atom[3];
const UC *input = (UC *) luaL_optlstring(L, 1, NULL, &isize); const UC *input = (const UC *) luaL_optlstring(L, 1, NULL, &isize);
const UC *last = input + isize; const UC *last = input + isize;
luaL_Buffer buffer; luaL_Buffer buffer;
/* end-of-input blackhole */ /* end-of-input blackhole */
@ -548,7 +548,7 @@ static int mime_global_unqp(lua_State *L)
luaL_buffinit(L, &buffer); luaL_buffinit(L, &buffer);
while (input < last) while (input < last)
asize = qpdecode(*input++, atom, asize, &buffer); asize = qpdecode(*input++, atom, asize, &buffer);
input = (UC *) luaL_optlstring(L, 2, NULL, &isize); input = (const UC *) luaL_optlstring(L, 2, NULL, &isize);
/* if second part is nil, we are done */ /* if second part is nil, we are done */
if (!input) { if (!input) {
luaL_pushresult(&buffer); luaL_pushresult(&buffer);
@ -578,7 +578,7 @@ static int mime_global_qpwrp(lua_State *L)
{ {
size_t size = 0; size_t size = 0;
int left = (int) luaL_checknumber(L, 1); int left = (int) luaL_checknumber(L, 1);
const UC *input = (UC *) luaL_optlstring(L, 2, NULL, &size); const UC *input = (const UC *) luaL_optlstring(L, 2, NULL, &size);
const UC *last = input + size; const UC *last = input + size;
int length = (int) luaL_optnumber(L, 3, 76); int length = (int) luaL_optnumber(L, 3, 76);
luaL_Buffer buffer; luaL_Buffer buffer;

1
src/options.h
View File

@ -52,6 +52,7 @@ int opt_get_ip6_multicast_loop(lua_State *L, p_socket ps);
int opt_get_ip6_multicast_hops(lua_State *L, p_socket ps); int opt_get_ip6_multicast_hops(lua_State *L, p_socket ps);
int opt_get_ip6_unicast_hops(lua_State *L, p_socket ps); int opt_get_ip6_unicast_hops(lua_State *L, p_socket ps);
int opt_get_ip6_v6only(lua_State *L, p_socket ps); int opt_get_ip6_v6only(lua_State *L, p_socket ps);
int opt_get_reuseport(lua_State *L, p_socket ps);
/* invokes the appropriate option handler */ /* invokes the appropriate option handler */
int opt_meth_setoption(lua_State *L, p_opt opt, p_socket ps); int opt_meth_setoption(lua_State *L, p_opt opt, p_socket ps);

2
src/udp.c
View File

@ -131,7 +131,7 @@ int udp_open(lua_State *L)
/*=========================================================================*\ /*=========================================================================*\
* Lua methods * Lua methods
\*=========================================================================*/ \*=========================================================================*/
const char *udp_strerror(int err) { static const char *udp_strerror(int err) {
/* a 'closed' error on an unconnected means the target address was not /* a 'closed' error on an unconnected means the target address was not
* accepted by the transport layer */ * accepted by the transport layer */
if (err == IO_CLOSED) return "refused"; if (err == IO_CLOSED) return "refused";