[vlc-commits] commit: Spelling (Pierre Ynard )
git at videolan.org
git at videolan.org
Mon Jul 19 22:45:38 CEST 2010
vlc/vlc-1.1 | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Sat Jun 5 19:04:44 2010 +0200| [d1520d927b2581cd44cb7f124bc6e7434542efaa] | committer: Rémi Duraffort
Spelling
(cherry picked from commit 8e6a4513d42bc602f5cb9f56c6a79299b60056e2)
Signed-off-by: Rémi Duraffort <ivoire at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=d1520d927b2581cd44cb7f124bc6e7434542efaa
---
configure.ac | 6 +++---
modules/misc/lua/demux.c | 8 ++++----
modules/misc/lua/extension.c | 16 ++++++++--------
modules/misc/lua/libs/httpd.c | 4 ++--
modules/misc/lua/libs/variables.c | 2 +-
modules/misc/lua/meta.c | 4 ++--
modules/misc/lua/services_discovery.c | 2 +-
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4eb3be1..ec32a93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1573,13 +1573,13 @@ AS_IF([test "x${enable_debug}" = "xno"], [
])
dnl
-dnl Allow runing as root (useful for people runing on embedded platforms)
+dnl Allow running as root (useful for people running on embedded platforms)
dnl
AC_ARG_ENABLE(run-as-root,
-[ --enable-run-as-root allow runing VLC as root (default disabled)])
+[ --enable-run-as-root allow running VLC as root (default disabled)])
AS_IF([test "${enable_run_as_root}" = "yes"],[
AC_DEFINE(ALLOW_RUN_AS_ROOT, 1,
- [Define to 1 to allow runing VLC as root (uid 0).])
+ [Define to 1 to allow running VLC as root (uid 0).])
])
dnl
diff --git a/modules/misc/lua/demux.c b/modules/misc/lua/demux.c
index 04f7144..3202675 100644
--- a/modules/misc/lua/demux.c
+++ b/modules/misc/lua/demux.c
@@ -169,14 +169,14 @@ static int probe_luascript( vlc_object_t *p_this, const char * psz_filename,
if( !lua_isfunction( L, -1 ) )
{
- msg_Warn( p_demux, "Error while runing script %s, "
+ msg_Warn( p_demux, "Error while running script %s, "
"function probe() not found", psz_filename );
goto error;
}
if( lua_pcall( L, 0, 1, 0 ) )
{
- msg_Warn( p_demux, "Error while runing script %s, "
+ msg_Warn( p_demux, "Error while running script %s, "
"function probe(): %s", psz_filename,
lua_tostring( L, lua_gettop( L ) ) );
goto error;
@@ -255,7 +255,7 @@ static int Demux( demux_t *p_demux )
if( !lua_isfunction( L, -1 ) )
{
- msg_Warn( p_demux, "Error while runing script %s, "
+ msg_Warn( p_demux, "Error while running script %s, "
"function parse() not found", psz_filename );
vlc_object_release( p_input_thread );
return VLC_EGENERIC;
@@ -263,7 +263,7 @@ static int Demux( demux_t *p_demux )
if( lua_pcall( L, 0, 1, 0 ) )
{
- msg_Warn( p_demux, "Error while runing script %s, "
+ msg_Warn( p_demux, "Error while running script %s, "
"function parse(): %s", psz_filename,
lua_tostring( L, lua_gettop( L ) ) );
vlc_object_release( p_input_thread );
diff --git a/modules/misc/lua/extension.c b/modules/misc/lua/extension.c
index 1634d06..7fa4ca2 100644
--- a/modules/misc/lua/extension.c
+++ b/modules/misc/lua/extension.c
@@ -266,14 +266,14 @@ int ScanLuaCallback( vlc_object_t *p_this, const char *psz_script,
if( !lua_isfunction( L, -1 ) )
{
- msg_Warn( p_mgr, "Error while runing script %s, "
+ msg_Warn( p_mgr, "Error while running script %s, "
"function descriptor() not found", psz_script );
goto exit;
}
if( lua_pcall( L, 0, 1, 0 ) )
{
- msg_Warn( p_mgr, "Error while runing script %s, "
+ msg_Warn( p_mgr, "Error while running script %s, "
"function descriptor(): %s", psz_script,
lua_tostring( L, lua_gettop( L ) ) );
goto exit;
@@ -656,14 +656,14 @@ static int GetMenuEntries( extensions_manager_t *p_mgr, extension_t *p_ext,
if( !lua_isfunction( L, -1 ) )
{
- msg_Warn( p_mgr, "Error while runing script %s, "
+ msg_Warn( p_mgr, "Error while running script %s, "
"function menu() not found", p_ext->psz_name );
goto exit;
}
if( lua_pcall( L, 0, 1, 0 ) )
{
- msg_Warn( p_mgr, "Error while runing script %s, "
+ msg_Warn( p_mgr, "Error while running script %s, "
"function menu(): %s", p_ext->psz_name,
lua_tostring( L, lua_gettop( L ) ) );
goto exit;
@@ -828,7 +828,7 @@ int lua_ExecuteFunctionVa( extensions_manager_t *p_mgr, extension_t *p_ext,
if( !lua_isfunction( L, -1 ) )
{
- msg_Warn( p_mgr, "Error while runing script %s, "
+ msg_Warn( p_mgr, "Error while running script %s, "
"function %s() not found", p_ext->psz_name, psz_function );
goto exit;
}
@@ -854,7 +854,7 @@ int lua_ExecuteFunctionVa( extensions_manager_t *p_mgr, extension_t *p_ext,
}
if( lua_pcall( L, i_args, 1, 0 ) )
{
- msg_Warn( p_mgr, "Error while runing script %s, "
+ msg_Warn( p_mgr, "Error while running script %s, "
"function %s(): %s", p_ext->psz_name, psz_function,
lua_tostring( L, lua_gettop( L ) ) );
goto exit;
@@ -885,7 +885,7 @@ int lua_ExtensionTriggerMenu( extensions_manager_t *p_mgr,
lua_getglobal( L, "trigger_menu" );
if( !lua_isfunction( L, -1 ) )
{
- msg_Warn( p_mgr, "Error while runing script %s, "
+ msg_Warn( p_mgr, "Error while running script %s, "
"function trigger_menu() not found", p_ext->psz_name );
return VLC_EGENERIC;
}
@@ -895,7 +895,7 @@ int lua_ExtensionTriggerMenu( extensions_manager_t *p_mgr,
if( lua_pcall( L, 1, 1, 0 ) != 0 )
{
- msg_Warn( p_mgr, "Error while runing script %s, "
+ msg_Warn( p_mgr, "Error while running script %s, "
"function trigger_menu(): %s", p_ext->psz_name,
lua_tostring( L, lua_gettop( L ) ) );
return VLC_EGENERIC;
diff --git a/modules/misc/lua/libs/httpd.c b/modules/misc/lua/libs/httpd.c
index 1dcb125..9d218af 100644
--- a/modules/misc/lua/libs/httpd.c
+++ b/modules/misc/lua/libs/httpd.c
@@ -145,7 +145,7 @@ static int vlclua_httpd_handler_callback(
/* function data err */
vlc_object_t *p_this = vlclua_get_this( L );
const char *psz_err = lua_tostring( L, -1 );
- msg_Err( p_this, "Error while runing the lua HTTPd handler "
+ msg_Err( p_this, "Error while running the lua HTTPd handler "
"callback: %s", psz_err );
lua_settop( L, 2 );
/* function data */
@@ -237,7 +237,7 @@ static int vlclua_httpd_file_callback(
/* function data err */
vlc_object_t *p_this = vlclua_get_this( L );
const char *psz_err = lua_tostring( L, -1 );
- msg_Err( p_this, "Error while runing the lua HTTPd file callback: %s",
+ msg_Err( p_this, "Error while running the lua HTTPd file callback: %s",
psz_err );
lua_settop( L, 2 );
/* function data */
diff --git a/modules/misc/lua/libs/variables.c b/modules/misc/lua/libs/variables.c
index 9c86a28..4373f37 100644
--- a/modules/misc/lua/libs/variables.c
+++ b/modules/misc/lua/libs/variables.c
@@ -320,7 +320,7 @@ static int vlclua_callback( vlc_object_t *p_this, char const *psz_var,
{
/* errormessage */
const char *psz_err = lua_tostring( L, -1 );
- msg_Err( p_this, "Error while runing lua interface callback: %s",
+ msg_Err( p_this, "Error while running lua interface callback: %s",
psz_err );
/* empty the stack (should only contain the error message) */
lua_settop( L, 0 );
diff --git a/modules/misc/lua/meta.c b/modules/misc/lua/meta.c
index 9c8e943..01f2620 100644
--- a/modules/misc/lua/meta.c
+++ b/modules/misc/lua/meta.c
@@ -111,14 +111,14 @@ static int run( vlc_object_t *p_this, const char * psz_filename,
if( !lua_isfunction( L, lua_gettop( L ) ) )
{
- msg_Warn( p_this, "Error while runing script %s, "
+ msg_Warn( p_this, "Error while running script %s, "
"function %s() not found", psz_filename, luafunction );
goto error;
}
if( lua_pcall( L, 0, 1, 0 ) )
{
- msg_Warn( p_this, "Error while runing script %s, "
+ msg_Warn( p_this, "Error while running script %s, "
"function %s(): %s", psz_filename, luafunction,
lua_tostring( L, lua_gettop( L ) ) );
goto error;
diff --git a/modules/misc/lua/services_discovery.c b/modules/misc/lua/services_discovery.c
index c0017ba..65b67a0 100644
--- a/modules/misc/lua/services_discovery.c
+++ b/modules/misc/lua/services_discovery.c
@@ -164,7 +164,7 @@ static void* Run( void *data )
lua_getglobal( L, "main" );
if( !lua_isfunction( L, lua_gettop( L ) ) || lua_pcall( L, 0, 1, 0 ) )
{
- msg_Err( p_sd, "Error while runing script %s, "
+ msg_Err( p_sd, "Error while running script %s, "
"function main(): %s", p_sys->psz_filename,
lua_tostring( L, lua_gettop( L ) ) );
lua_pop( L, 1 );
More information about the vlc-commits
mailing list