From ab1202af18e34427750d8c8d72240145869f2a68 Mon Sep 17 00:00:00 2001 From: Tim Orling <TicoTimo@gmail.com> Date: Sun, 2 Aug 2015 20:04:25 -0700 Subject: [PATCH] * luaL_checkint and luaL_optint deprecated in lua 5.3 * Replacements are luaL_checkinteger and luaL_optinteger Signed-off-by: Tim Orling <TicoTimo@gmail.com> --- modules/lua/libs/net.c | 22 +++++++++++----------- modules/lua/libs/osd.c | 12 ++++++------ modules/lua/libs/playlist.c | 10 +++++----- modules/lua/libs/stream.c | 2 +- modules/lua/libs/volume.c | 6 +++--- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/modules/lua/libs/net.c b/modules/lua/libs/net.c index 3d760bf451a..85a7432138e 100644 --- a/modules/lua/libs/net.c +++ b/modules/lua/libs/net.c @@ -208,7 +208,7 @@ static int vlclua_net_listen_tcp( lua_State *L ) { vlc_object_t *p_this = vlclua_get_this( L ); const char *psz_host = luaL_checkstring( L, 1 ); - int i_port = luaL_checkint( L, 2 ); + int i_port = luaL_checkinteger( L, 2 ); int *pi_fd = net_ListenTCP( p_this, psz_host, i_port ); if( pi_fd == NULL ) return luaL_error( L, "Cannot listen on %s:%d", psz_host, i_port ); diff --git a/modules/lua/libs/osd.c b/modules/lua/libs/osd.c index 2d3ee1f94a2..796c15d39c1 100644 --- a/modules/lua/libs/osd.c +++ b/modules/lua/libs/osd.c @@ -198,7 +198,7 @@ static int vlclua_spu_channel_register( lua_State *L ) static int vlclua_spu_channel_clear( lua_State *L ) { - int i_chan = luaL_checkint( L, 1 ); + int i_chan = luaL_checkinteger( L, 1 ); input_thread_t *p_input = vlclua_get_input_internal( L ); if( !p_input ) return luaL_error( L, "Unable to find input." ); diff --git a/modules/lua/libs/playlist.c b/modules/lua/libs/playlist.c index 115926262e8..b671b7f3984 100644 --- a/modules/lua/libs/playlist.c +++ b/modules/lua/libs/playlist.c @@ -69,7 +69,7 @@ static int vlclua_playlist_next( lua_State * L ) static int vlclua_playlist_skip( lua_State * L ) { - int i_skip = luaL_checkint( L, 1 ); + int i_skip = luaL_checkinteger( L, 1 ); playlist_t *p_playlist = vlclua_get_playlist_internal( L ); playlist_Skip( p_playlist, i_skip ); return 0; @@ -127,7 +127,7 @@ static int vlclua_playlist_random( lua_State * L ) static int vlclua_playlist_gotoitem( lua_State * L ) { - int i_id = luaL_checkint( L, 1 ); + int i_id = luaL_checkinteger( L, 1 ); playlist_t *p_playlist = vlclua_get_playlist_internal( L ); PL_LOCK; playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true, NULL, @@ -138,7 +138,7 @@ static int vlclua_playlist_gotoitem( lua_State * L ) static int vlclua_playlist_delete( lua_State * L ) { - int i_id = luaL_checkint( L, 1 ); + int i_id = luaL_checkinteger( L, 1 ); playlist_t *p_playlist = vlclua_get_playlist_internal( L ); PL_LOCK; playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id ); @@ -154,8 +154,8 @@ static int vlclua_playlist_delete( lua_State * L ) static int vlclua_playlist_move( lua_State * L ) { - int i_item = luaL_checkint( L, 1 ); - int i_target = luaL_checkint( L, 2 ); + int i_item = luaL_checkinteger( L, 1 ); + int i_target = luaL_checkinteger( L, 2 ); playlist_t *p_playlist = vlclua_get_playlist_internal( L ); PL_LOCK; playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_item ); diff --git a/modules/lua/libs/stream.c b/modules/lua/libs/stream.c index f93fe0b03a4..20b34d9c1b9 100644 --- a/modules/lua/libs/stream.c +++ b/modules/lua/libs/stream.c @@ -101,7 +101,7 @@ static int vlclua_stream_read( lua_State *L ) { int i_read; stream_t **pp_stream = (stream_t **)luaL_checkudata( L, 1, "stream" ); - int n = luaL_checkint( L, 2 ); + int n = luaL_checkinteger( L, 2 ); uint8_t *p_read = malloc( n ); if( !p_read ) return vlclua_error( L ); diff --git a/modules/lua/libs/volume.c b/modules/lua/libs/volume.c index b361647545c..d37568bae41 100644 --- a/modules/lua/libs/volume.c +++ b/modules/lua/libs/volume.c @@ -48,7 +48,7 @@ static int vlclua_volume_set( lua_State *L ) { playlist_t *p_this = vlclua_get_playlist_internal( L ); - int i_volume = luaL_checkint( L, 1 ); + int i_volume = luaL_checkinteger( L, 1 ); if( i_volume < 0 ) i_volume = 0; int i_ret = playlist_VolumeSet( p_this, i_volume/(float)AOUT_VOLUME_DEFAULT ); --- vlc-3.0.3/modules/lua/demux.c.old 2017-12-21 09:51:16.000000000 +0000 +++ vlc-3.0.3/modules/lua/demux.c 2018-07-21 23:42:36.490000000 +0000 @@ -52,7 +52,7 @@ static int vlclua_demux_peek( lua_State *L ) { stream_t *s = (stream_t *)vlclua_get_this(L); - int n = luaL_checkint( L, 1 ); + int n = luaL_checkinteger( L, 1 ); const uint8_t *p_peek; ssize_t val = vlc_stream_Peek(s->p_source, &p_peek, n); @@ -66,7 +66,7 @@ static int vlclua_demux_read( lua_State *L ) { stream_t *s = (stream_t *)vlclua_get_this(L); - int n = luaL_checkint( L, 1 ); + int n = luaL_checkinteger( L, 1 ); char *buf = malloc(n); if (buf != NULL) --- vlc-3.0.3/modules/lua/libs/dialog.c.old 2017-11-24 15:29:18.000000000 +0000 +++ vlc-3.0.3/modules/lua/libs/dialog.c 2018-07-21 23:43:12.100000000 +0000 @@ -382,7 +382,7 @@ /* Read entry in the Lua registry */ lua_pushlightuserdata( L, (void*) &key_update ); lua_gettable( L, LUA_REGISTRYINDEX ); - return luaL_checkint( L, -1 ); + return luaL_checkinteger( L, -1 ); } /** Manually update a dialog @@ -573,22 +573,22 @@ /* Set common arguments: col, row, hspan, vspan, width, height */ if( lua_isnumber( L, arg ) ) - p_widget->i_column = luaL_checkint( L, arg ); + p_widget->i_column = luaL_checkinteger( L, arg ); else goto end_of_args; if( lua_isnumber( L, ++arg ) ) - p_widget->i_row = luaL_checkint( L, arg ); + p_widget->i_row = luaL_checkinteger( L, arg ); else goto end_of_args; if( lua_isnumber( L, ++arg ) ) - p_widget->i_horiz_span = luaL_checkint( L, arg ); + p_widget->i_horiz_span = luaL_checkinteger( L, arg ); else goto end_of_args; if( lua_isnumber( L, ++arg ) ) - p_widget->i_vert_span = luaL_checkint( L, arg ); + p_widget->i_vert_span = luaL_checkinteger( L, arg ); else goto end_of_args; if( lua_isnumber( L, ++arg ) ) - p_widget->i_width = luaL_checkint( L, arg ); + p_widget->i_width = luaL_checkinteger( L, arg ); else goto end_of_args; if( lua_isnumber( L, ++arg ) ) - p_widget->i_height = luaL_checkint( L, arg ); + p_widget->i_height = luaL_checkinteger( L, arg ); else goto end_of_args; end_of_args: --- vlc-3.0.3/modules/lua/libs/net.c.old 2018-07-21 23:33:19.070000000 +0000 +++ vlc-3.0.3/modules/lua/libs/net.c 2018-07-21 23:43:52.200000000 +0000 @@ -251,7 +251,7 @@ { vlc_object_t *p_this = vlclua_get_this( L ); const char *psz_host = luaL_checkstring( L, 1 ); - int i_port = luaL_checkint( L, 2 ); + int i_port = luaL_checkinteger( L, 2 ); int i_fd = net_ConnectTCP( p_this, psz_host, i_port ); lua_pushinteger( L, vlclua_fd_map_safe( L, i_fd ) ); return 1; @@ -259,14 +259,14 @@ static int vlclua_net_close( lua_State *L ) { - int i_fd = luaL_checkint( L, 1 ); + int i_fd = luaL_checkinteger( L, 1 ); vlclua_fd_unmap_safe( L, i_fd ); return 0; } static int vlclua_net_send( lua_State *L ) { - int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) ); + int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) ); size_t i_len; const char *psz_buffer = luaL_checklstring( L, 2, &i_len ); @@ -278,7 +278,7 @@ static int vlclua_net_recv( lua_State *L ) { - int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) ); + int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) ); size_t i_len = (size_t)luaL_optinteger( L, 2, 1 ); char psz_buffer[i_len]; @@ -312,7 +312,7 @@ lua_pushnil( L ); for( int i = 0; lua_next( L, 1 ); i++ ) { - luafds[i] = luaL_checkint( L, -2 ); + luafds[i] = luaL_checkinteger( L, -2 ); p_fds[i].fd = vlclua_fd_get( L, luafds[i] ); p_fds[i].events = luaL_checkinteger( L, -1 ); p_fds[i].events &= POLLIN | POLLOUT | POLLPRI; @@ -360,7 +360,7 @@ #ifndef _WIN32 static int vlclua_fd_write( lua_State *L ) { - int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) ); + int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) ); size_t i_len; const char *psz_buffer = luaL_checklstring( L, 2, &i_len ); @@ -371,7 +371,7 @@ static int vlclua_fd_read( lua_State *L ) { - int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) ); + int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) ); size_t i_len = (size_t)luaL_optinteger( L, 2, 1 ); char psz_buffer[i_len]; --- vlc-3.0.3/modules/lua/libs/osd.c.old 2018-07-21 23:33:19.070000000 +0000 +++ vlc-3.0.3/modules/lua/libs/osd.c 2018-07-21 23:44:09.710000000 +0000 @@ -154,7 +154,7 @@ static int vlclua_osd_slider( lua_State *L ) { - int i_position = luaL_checkint( L, 1 ); + int i_position = luaL_checkinteger( L, 1 ); const char *psz_type = luaL_checkstring( L, 2 ); int i_type = vlc_osd_slider_type_from_string( psz_type ); int i_chan = (int)luaL_optinteger( L, 3, VOUT_SPU_CHANNEL_OSD ); --- vlc-3.0.3/modules/lua/libs/io.c.old 2018-04-18 16:19:34.000000000 +0000 +++ vlc-3.0.3/modules/lua/libs/io.c 2018-07-22 00:12:13.260000000 +0000 @@ -139,7 +139,7 @@ const char* psz_mode = luaL_optstring( L, 2, NULL ); if ( psz_mode != NULL ) { - long i_offset = luaL_optlong( L, 3, 0 ); + long i_offset = (long)luaL_optinteger( L, 3, 0 ); int i_mode; if ( !strcmp( psz_mode, "set" ) ) i_mode = SEEK_SET;