[MPlayer-cvslog] r24880 - trunk/subreader.c

[iive]

Author: iive
Date: Sun Oct 28 16:53:08 2007
New Revision: 24880

Log:
Cleanup guess_buffer_cp() a bit, remove tmp variable, break the loop on success.
Requested by ulion.


Modified:
   trunk/subreader.c

Modified: trunk/subreader.c
==============================================================================
--- trunk/subreader.c	(original)
+++ trunk/subreader.c	Sun Oct 28 16:53:08 2007
@@ -1287,17 +1287,14 @@ const char* guess_buffer_cp(unsigned cha
     mp_msg(MSGT_SUBREADER, MSGL_V, "\n");
     
     for (i = 0; i < langcnt; i++) {
-	const char *tmp;
-	
 	if (strcasecmp(languages[i], preferred_language) != 0) continue;
 	analyser = enca_analyser_alloc(languages[i]);
 	encoding = enca_analyse_const(analyser, buffer, buflen);
-	tmp = enca_charset_name(encoding.charset, ENCA_NAME_STYLE_ICONV);
-	if (tmp && encoding.charset != ENCA_CS_UNKNOWN) {
-	    detected_sub_cp = tmp;
-	    mp_msg(MSGT_SUBREADER, MSGL_INFO, "ENCA detected charset: %s\n", tmp);
-	}
 	enca_analyser_free(analyser);
+	if (encoding.charset != ENCA_CS_UNKNOWN) {
+	    detected_sub_cp = enca_charset_name(encoding.charset, ENCA_NAME_STYLE_ICONV);
+	    break;
+	}
     }
     
     free(languages);
@@ -1305,6 +1302,8 @@ const char* guess_buffer_cp(unsigned cha
     if (!detected_sub_cp) {
 	detected_sub_cp = fallback;
 	mp_msg(MSGT_SUBREADER, MSGL_INFO, "ENCA detection failed: fallback to %s\n", fallback);
+    }else{
+	mp_msg(MSGT_SUBREADER, MSGL_INFO, "ENCA detected charset: %s\n", detected_sub_cp);
     }
 
     return detected_sub_cp;