[vlc-commits] Qt: str_format_meta: fix few variable names

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Jun 13 21:09:02 2011 +0200| [63aadee0d159cd7aa2a7af07f67c75ac6116ae65] | committer: Francois Cartegnie

Qt: str_format_meta: fix few variable names

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=63aadee0d159cd7aa2a7af07f67c75ac6116ae65
---

 src/text/strings.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/text/strings.c b/src/text/strings.c
index e1d6356..830d8c4 100644
--- a/src/text/strings.c
+++ b/src/text/strings.c
@@ -738,12 +738,12 @@ char *str_format_meta( vlc_object_t *p_object, const char *string )
                     break;
                 case 's':
                     {
-                        char *lang = NULL;
+                        char *psz_lang = NULL;
                         if( p_input )
-                            lang = var_GetNonEmptyString( p_input, "sub-language" );
-                        if( lang == NULL )
-                            lang = strdup( b_empty_if_na ? "" : "-" );
-                        INSERT_STRING( lang );
+                            psz_lang = var_GetNonEmptyString( p_input, "sub-language" );
+                        if( psz_lang == NULL )
+                            psz_lang = strdup( b_empty_if_na ? "" : "-" );
+                        INSERT_STRING( psz_lang );
                         break;
                     }
                 case 't':
@@ -901,21 +901,21 @@ char *str_format_meta( vlc_object_t *p_object, const char *string )
                 case 'Z':
                     if( p_item )
                     {
-                        char *now_playing = input_item_GetNowPlaying( p_item );
-                        if ( now_playing == NULL )
+                        char *psz_now_playing = input_item_GetNowPlaying( p_item );
+                        if ( psz_now_playing == NULL )
                         {
-                            char *temp = input_item_GetTitleFbName( p_item );
+                            char *psz_temp = input_item_GetTitleFbName( p_item );
                             char *psz_artist = input_item_GetArtist( p_item );
-                            if( !EMPTY_STR( temp ) )
+                            if( !EMPTY_STR( psz_temp ) )
                             {
-                                INSERT_STRING( temp );
+                                INSERT_STRING( psz_temp );
                                 if ( !EMPTY_STR( psz_artist ) )
                                     INSERT_STRING_NO_FREE( " - " );
                             }
                             INSERT_STRING( psz_artist );
                         }
                         else
-                            INSERT_STRING( now_playing );
+                            INSERT_STRING( psz_now_playing );
                     }
                     break;