[vlc-commits] commit: Return 64-bits values for integer object variables ( Rémi Denis-Courmont )
git at videolan.org
git at videolan.org
Sun Jul 11 14:45:58 CEST 2010
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jul 11 15:45:08 2010 +0300| [d601ddbb3d7835ebc32f67ad48300ebf8b132e54] | committer: Rémi Denis-Courmont
Return 64-bits values for integer object variables
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d601ddbb3d7835ebc32f67ad48300ebf8b132e54
---
include/vlc_variables.h | 16 ++++++++--------
src/config/cmdline.c | 4 ++--
src/input/vlmshell.c | 4 ++--
src/misc/variables.c | 2 +-
src/osd/osd.c | 2 +-
src/text/strings.c | 6 +++---
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/include/vlc_variables.h b/include/vlc_variables.h
index 21d4743..927749a 100644
--- a/include/vlc_variables.h
+++ b/include/vlc_variables.h
@@ -292,7 +292,7 @@ int var_SetAddress( vlc_object_t *p_obj, const char *psz_name, void *ptr )
* \param psz_name The name of the variable
*/
LIBVLC_USED
-static inline int var_GetInteger( vlc_object_t *p_obj, const char *psz_name )
+static inline int64_t var_GetInteger( vlc_object_t *p_obj, const char *psz_name )
{
vlc_value_t val;
if( !var_GetChecked( p_obj, psz_name, VLC_VAR_INTEGER, &val ) )
@@ -408,7 +408,7 @@ static inline void *var_GetAddress( vlc_object_t *p_obj, const char *psz_name )
* \param p_obj the object that holds the variable
* \param psz_name the name of the variable
*/
-static inline int var_IncInteger( vlc_object_t *p_obj, const char *psz_name )
+static inline int64_t var_IncInteger( vlc_object_t *p_obj, const char *psz_name )
{
vlc_value_t val;
val.i_int = 1;
@@ -422,7 +422,7 @@ static inline int var_IncInteger( vlc_object_t *p_obj, const char *psz_name )
* \param p_obj the object that holds the variable
* \param psz_name the name of the variable
*/
-static inline int var_DecInteger( vlc_object_t *p_obj, const char *psz_name )
+static inline int64_t var_DecInteger( vlc_object_t *p_obj, const char *psz_name )
{
vlc_value_t val;
val.i_int = -1;
@@ -431,7 +431,7 @@ static inline int var_DecInteger( vlc_object_t *p_obj, const char *psz_name )
}
#define var_DecInteger(a,b) var_DecInteger( VLC_OBJECT(a), b )
-static inline unsigned var_OrInteger( vlc_object_t *obj, const char *name,
+static inline uint64_t var_OrInteger( vlc_object_t *obj, const char *name,
unsigned v )
{
vlc_value_t val;
@@ -441,7 +441,7 @@ static inline unsigned var_OrInteger( vlc_object_t *obj, const char *name,
}
#define var_OrInteger(a,b,c) var_OrInteger(VLC_OBJECT(a),b,c)
-static inline unsigned var_NAndInteger( vlc_object_t *obj, const char *name,
+static inline uint64_t var_NAndInteger( vlc_object_t *obj, const char *name,
unsigned v )
{
vlc_value_t val;
@@ -458,7 +458,7 @@ static inline unsigned var_NAndInteger( vlc_object_t *obj, const char *name,
* \param psz_name The name of the variable
*/
LIBVLC_USED
-static inline int var_CreateGetInteger( vlc_object_t *p_obj, const char *psz_name )
+static inline int64_t var_CreateGetInteger( vlc_object_t *p_obj, const char *psz_name )
{
var_Create( p_obj, psz_name, VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
return var_GetInteger( p_obj, psz_name );
@@ -554,7 +554,7 @@ static inline void *var_CreateGetAddress( vlc_object_t *p_obj,
* \param psz_name The name of the variable
*/
LIBVLC_USED
-static inline int var_CreateGetIntegerCommand( vlc_object_t *p_obj, const char *psz_name )
+static inline int64_t var_CreateGetIntegerCommand( vlc_object_t *p_obj, const char *psz_name )
{
var_Create( p_obj, psz_name, VLC_VAR_INTEGER | VLC_VAR_DOINHERIT
| VLC_VAR_ISCOMMAND );
@@ -666,7 +666,7 @@ static inline bool var_InheritBool( vlc_object_t *obj, const char *name )
#define var_InheritBool(o, n) var_InheritBool(VLC_OBJECT(o), n)
LIBVLC_USED
-static inline int var_InheritInteger( vlc_object_t *obj, const char *name )
+static inline int64_t var_InheritInteger( vlc_object_t *obj, const char *name )
{
vlc_value_t val;
diff --git a/src/config/cmdline.c b/src/config/cmdline.c
index 9befc0e..d01c133 100644
--- a/src/config/cmdline.c
+++ b/src/config/cmdline.c
@@ -257,7 +257,7 @@ int config_LoadCmdLine( vlc_object_t *p_this, int i_argc,
case CONFIG_ITEM_INTEGER:
var_Create( p_this, psz_name, VLC_VAR_INTEGER );
var_SetInteger( p_this, psz_name,
- strtol(state.optarg, NULL, 0));
+ strtoll(state.optarg, NULL, 0));
break;
case CONFIG_ITEM_FLOAT:
var_Create( p_this, psz_name, VLC_VAR_FLOAT );
@@ -304,7 +304,7 @@ int config_LoadCmdLine( vlc_object_t *p_this, int i_argc,
else
{
var_SetInteger( p_this, name,
- strtol(state.optarg, NULL, 0) );
+ strtoll(state.optarg, NULL, 0) );
}
break;
case CONFIG_ITEM_BOOL:
diff --git a/src/input/vlmshell.c b/src/input/vlmshell.c
index d2fcc54..6fff542 100644
--- a/src/input/vlmshell.c
+++ b/src/input/vlmshell.c
@@ -1373,8 +1373,8 @@ static vlm_message_t *vlm_ShowMedia( vlm_media_sys_t *p_media )
APPEND_INPUT_INFO( "time", "%"PRIi64, Time );
APPEND_INPUT_INFO( "length", "%"PRIi64, Time );
APPEND_INPUT_INFO( "rate", "%f", Float );
- APPEND_INPUT_INFO( "title", "%d", Integer );
- APPEND_INPUT_INFO( "chapter", "%d", Integer );
+ APPEND_INPUT_INFO( "title", "%"PRId64, Integer );
+ APPEND_INPUT_INFO( "chapter", "%"PRId64, Integer );
APPEND_INPUT_INFO( "can-seek", "%d", Bool );
}
#undef APPEND_INPUT_INFO
diff --git a/src/misc/variables.c b/src/misc/variables.c
index 9374f3e..c91cb41 100644
--- a/src/misc/variables.c
+++ b/src/misc/variables.c
@@ -1054,7 +1054,7 @@ void var_OptionParse( vlc_object_t *p_obj, const char *psz_option,
break;
case VLC_VAR_INTEGER:
- val.i_int = strtol( psz_value, NULL, 0 );
+ val.i_int = strtoll( psz_value, NULL, 0 );
break;
case VLC_VAR_FLOAT:
diff --git a/src/osd/osd.c b/src/osd/osd.c
index 7c5046d..4a40959 100644
--- a/src/osd/osd.c
+++ b/src/osd/osd.c
@@ -399,7 +399,7 @@ void osd_MenuActivate( vlc_object_t *p_this )
var_InheritInteger( p_osd, p_button->psz_action ) );
#if defined(OSD_MENU_DEBUG)
msg_Dbg( p_osd, "select (%d, %s)",
- var_InheritInteger( p_osd, p_button->psz_action ),
+ (int)var_InheritInteger( p_osd, p_button->psz_action ),
p_button->psz_action );
#endif
}
diff --git a/src/text/strings.c b/src/text/strings.c
index 90bae5e..0a31474 100644
--- a/src/text/strings.c
+++ b/src/text/strings.c
@@ -764,7 +764,7 @@ char *str_format_meta( vlc_object_t *p_object, const char *string )
case 'B':
if( p_input )
{
- snprintf( buf, 10, "%d",
+ snprintf( buf, 10, "%"PRId64,
var_GetInteger( p_input, "bit-rate" )/1000 );
}
else
@@ -774,7 +774,7 @@ char *str_format_meta( vlc_object_t *p_object, const char *string )
case 'C':
if( p_input )
{
- snprintf( buf, 10, "%d",
+ snprintf( buf, 10, "%"PRId64,
var_GetInteger( p_input, "chapter" ) );
}
else
@@ -800,7 +800,7 @@ char *str_format_meta( vlc_object_t *p_object, const char *string )
case 'I':
if( p_input )
{
- snprintf( buf, 10, "%d",
+ snprintf( buf, 10, "%"PRId64,
var_GetInteger( p_input, "title" ) );
}
else
More information about the vlc-commits
mailing list