[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[551] mplayerxp

[<nic...@us...>]

Revision: 551
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=551&view=rev
Author:   nickols_k
Date:     2012-12-12 15:33:11 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
use const std::string& in mp_msg

Modified Paths:
--------------
    mplayerxp/mp_msg.cpp
    mplayerxp/mp_msg.h

Modified: mplayerxp/mp_msg.cpp
===================================================================
--- mplayerxp/mp_msg.cpp	2012-12-12 15:25:16 UTC (rev 550)
+++ mplayerxp/mp_msg.cpp	2012-12-12 15:33:11 UTC (rev 551)
@@ -83,7 +83,7 @@
     "POSTPR"
 };
 
-int mpxp_printf( unsigned x, const char *format, ... ){
+int mpxp_printf( unsigned x, const std::string& format, ... ){
 /* TODO: more useful usage of module_id */
     int rc=0;
     char* sbuf=new char[0xFFFFF];
@@ -112,7 +112,7 @@
     }
     va_list va;
     va_start(va, format);
-    ssize=vsprintf(sbuf,format, va);
+    ssize=vsprintf(sbuf,format.c_str(), va);
     va_end(va);
     if(strcmp(nls_get_screen_cp(),"UTF-8")!=0) {
 	char *obuf;
@@ -121,7 +121,7 @@
 	delete obuf;
     }
     else rc=fputs(sbuf,stderr);
-    if(format[strlen(format)-1]=='\n') was_eol=1;
+    if(format[format.length()-1]=='\n') was_eol=1;
     else was_eol=0;
     fflush(stderr);
 //    if(priv) pthread_mutex_unlock(&priv->mp_msg_mutex);

Modified: mplayerxp/mp_msg.h
===================================================================
--- mplayerxp/mp_msg.h	2012-12-12 15:25:16 UTC (rev 550)
+++ mplayerxp/mp_msg.h	2012-12-12 15:33:11 UTC (rev 551)
@@ -2,6 +2,8 @@
 #define __MP_MSG_H 1
 #include "mplayerxp.h"
 
+#include <string>
+
 /* TODO: more highlighted levels */
 #ifndef MSGT_CLASS
 #define MSGT_CLASS MSGT_CPLAYER
@@ -55,51 +57,51 @@
     void mpxp_print_init(int verbose);
     void mpxp_print_uninit(void);
     void mpxp_print_flush(void);
-    int  mpxp_printf( unsigned x, const char *format, ... );
+    int  mpxp_printf( unsigned x, const std::string& format, ... );
 
-    inline int mpxp_print_dummy(const char* args,...) {
+    inline int mpxp_print_dummy(const std::string& args,...) {
 	UNUSED(args); return 0;
     }
 
 #ifdef __va_arg_pack /* requires gcc-4.3.x */
-__always_inline int MSG_INFO(const char* args,...) {
+__always_inline int MSG_INFO(const std::string& args,...) {
     return mpxp_printf((MSGL_INFO<<28)|(MSGT_CLASS&0x0FFFFFFF),args,__va_arg_pack ());
 }
-__always_inline int MSG_FATAL(const char* args,...) {
+__always_inline int MSG_FATAL(const std::string& args,...) {
     return mpxp_printf((MSGL_FATAL<<28)|(MSGT_CLASS&0x0FFFFFFF),args,__va_arg_pack ());
 }
-__always_inline int MSG_WARN(const char* args,...) {
+__always_inline int MSG_WARN(const std::string& args,...) {
     return mpxp_printf((MSGL_WARN<<28)|(MSGT_CLASS&0x0FFFFFFF),args,__va_arg_pack ());
 }
-__always_inline int MSG_ERR(const char* args,...) {
+__always_inline int MSG_ERR(const std::string& args,...) {
     return mpxp_printf((MSGL_ERR<<28)|(MSGT_CLASS&0x0FFFFFFF),args,__va_arg_pack ());
 }
-__always_inline int MSG_OK(const char* args,...) {
+__always_inline int MSG_OK(const std::string& args,...) {
     return mpxp_printf((MSGL_OK<<28)|(MSGT_CLASS&0x0FFFFFFF),args,__va_arg_pack ());
 }
-__always_inline int MSG_HINT(const char* args,...) {
+__always_inline int MSG_HINT(const std::string& args,...) {
     return mpxp_printf((MSGL_HINT<<28)|(MSGT_CLASS&0x0FFFFFFF),args,__va_arg_pack ());
 }
-__always_inline int MSG_STATUS(const char* args,...) {
+__always_inline int MSG_STATUS(const std::string& args,...) {
     return mpxp_printf((MSGL_STATUS<<28)|(MSGT_CLASS&0x0FFFFFFF),args,__va_arg_pack ());
 }
-__always_inline int MSG_V(const char* args,...) {
+__always_inline int MSG_V(const std::string& args,...) {
     return mp_conf.verbose ?
 	mpxp_printf((MSGL_V<<28)|(MSGT_CLASS&0x0FFFFFFF),args,__va_arg_pack ()):
 	0;
 }
 
-__always_inline int MSG_DBG2(const char* args,...) {
+__always_inline int MSG_DBG2(const std::string& args,...) {
     return mp_conf.verbose>1 ?
 	mpxp_printf((MSGL_DBG2<<28)|(MSGT_CLASS&0x0FFFFFFF),args,__va_arg_pack ()):
 	0;
 }
-__always_inline int MSG_DBG3(const char* args,...) {
+__always_inline int MSG_DBG3(const std::string& args,...) {
     return mp_conf.verbose>2 ?
 	mpxp_printf((MSGL_DBG3<<28)|(MSGT_CLASS&0x0FFFFFFF),args,__va_arg_pack ()):
 	0;
 }
-__always_inline int MSG_DBG4(const char* args,...) {
+__always_inline int MSG_DBG4(const std::string& args,...) {
     return mp_conf.verbose>3 ?
 	mpxp_printf((MSGL_DBG4<<28)|(MSGT_CLASS&0x0FFFFFFF),args,__va_arg_pack ()):
 	0;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.