Mercurial > mplayer.hg

changeset 35794:153a4c76e291

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic: Rename variable.
author ib
date Fri, 25 Jan 2013 21:52:55 +0000
parents c6ffe6a4c1e5
children 5eac7c0879b7
files gui/interface.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Fri Jan 25 16:03:39 2013 +0000
+++ b/gui/interface.c	Fri Jan 25 21:52:55 2013 +0000
@@ -77,7 +77,7 @@
  */
 void guiInit(void)
 {
-    int r;
+    int ret;
     plItem *playlist;
 
     mp_msg(MSGT_GPLAYER, MSGL_V, "GUI init.\n");
@@ -125,16 +125,16 @@
     if (!skinName)
         skinName = strdup("default");
 
-    r = skinRead(skinName);
+    ret = skinRead(skinName);
 
-    if (r == -1 && strcmp(skinName, "default") != 0) {
+    if (ret == -1 && strcmp(skinName, "default") != 0) {
         mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_SKIN_SKINCFG_SelectedSkinNotFound, skinName);
 
         skinName = strdup("default");
-        r = skinRead(skinName);
+        ret      = skinRead(skinName);
     }
 
-    switch (r) {
+    switch (ret) {
     case -1:
         gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SKINCFG_SkinNotFound, skinName);
         mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);