r3279 - in trunk: libmcrypto/source/openssl libmsip/source libmstun/source libmutil/include/libmutil libmutil/source

[erik at minisip.org]

Author: erik
Date: 2007-05-21 11:01:14 +0200 (Mon, 21 May 2007)
New Revision: 3279

Modified:
   trunk/libmcrypto/source/openssl/TlsSocket.cxx
   trunk/libmsip/source/SipSMCommand.cxx
   trunk/libmstun/source/STUN.cxx
   trunk/libmutil/include/libmutil/Thread.h
   trunk/libmutil/include/libmutil/massert.h
   trunk/libmutil/source/TextUI.cxx
   trunk/libmutil/source/ThreadPosix.cxx
   trunk/libmutil/source/ThreadWin32.cxx
   trunk/libmutil/source/massert.cxx
Log:

 * Fix compile warnings when using g++-4.2.

   String constants are no longer converted to "char *" without warnings.

       void f(char *);
       f("hello"); <-- warning




Modified: trunk/libmcrypto/source/openssl/TlsSocket.cxx
===================================================================
--- trunk/libmcrypto/source/openssl/TlsSocket.cxx	2007-05-12 14:17:00 UTC (rev 3278)
+++ trunk/libmcrypto/source/openssl/TlsSocket.cxx	2007-05-21 09:01:14 UTC (rev 3279)
@@ -279,7 +279,7 @@
 }
 
 int32_t OsslSocket::setSSLCTXCiphers ( SSL_CTX *_ctx, int8_t listIdx ) {
-	char *ciphers;
+	const char *ciphers;
 	
 #ifdef DEBUG_OUTPUT
 		cerr << "Modifying SSL_CTX ciphers list" << endl;

Modified: trunk/libmsip/source/SipSMCommand.cxx
===================================================================
--- trunk/libmsip/source/SipSMCommand.cxx	2007-05-12 14:17:00 UTC (rev 3278)
+++ trunk/libmsip/source/SipSMCommand.cxx	2007-05-21 09:01:14 UTC (rev 3279)
@@ -45,7 +45,7 @@
 #else
 ostream & operator<<(ostream &o, const SipSMCommand &c){
 #endif
-	char *s[6]={"(illegal)","dialog_layer","transaction_layer","(illegal)","dispatcher","transport_layer"};
+	const char *s[6]={"(illegal)","dialog_layer","transaction_layer","(illegal)","dispatcher","transport_layer"};
 	if (c.type==SipSMCommand::COMMAND_PACKET){
                 
 		o <<"COMMAND_PACKET:"

Modified: trunk/libmstun/source/STUN.cxx
===================================================================
--- trunk/libmstun/source/STUN.cxx	2007-05-12 14:17:00 UTC (rev 3278)
+++ trunk/libmstun/source/STUN.cxx	2007-05-21 09:01:14 UTC (rev 3279)
@@ -43,7 +43,7 @@
 const int STUN::STUNTYPE_RESTRICTED=6;
 const int STUN::STUNTYPE_SYMMETRIC_FIREWALL=7;
 
-static char *msgs[]={
+static const char *msgs[]={
 	"ERROR",
 	"BLOCKED",
 	"OpenInternet",

Modified: trunk/libmutil/include/libmutil/Thread.h
===================================================================
--- trunk/libmutil/include/libmutil/Thread.h	2007-05-12 14:17:00 UTC (rev 3278)
+++ trunk/libmutil/include/libmutil/Thread.h	2007-05-21 09:01:14 UTC (rev 3279)
@@ -33,7 +33,7 @@
 
 class LIBMUTIL_API ThreadException : public Exception{
 public:
-	ThreadException(char* description);
+	ThreadException(const char* description);
 };
 
 

Modified: trunk/libmutil/include/libmutil/massert.h
===================================================================
--- trunk/libmutil/include/libmutil/massert.h	2007-05-12 14:17:00 UTC (rev 3278)
+++ trunk/libmutil/include/libmutil/massert.h	2007-05-21 09:01:14 UTC (rev 3279)
@@ -5,7 +5,7 @@
 
 
 
-LIBMUTIL_API void massertFailed(char *expr, char *file, char *baseFile, int line);
+LIBMUTIL_API void massertFailed(const char *expr, const char *file, const char *baseFile, int line);
 
 #ifdef NDEBUG
 #define massert(exp)

Modified: trunk/libmutil/source/TextUI.cxx
===================================================================
--- trunk/libmutil/source/TextUI.cxx	2007-05-12 14:17:00 UTC (rev 3278)
+++ trunk/libmutil/source/TextUI.cxx	2007-05-21 09:01:14 UTC (rev 3279)
@@ -65,9 +65,9 @@
 
 
 #if defined(_MSC_VER) || defined(WIN32)
-char *termCodes[]= { "", "", "", "", "" };
+const char *termCodes[]= { "", "", "", "", "" };
 #else
-char *termCodes[]= { "\033[m", "\033[2m\033[1m", "\033[31m", "\033[34m", "\033[42m" };
+const char *termCodes[]= { "\033[m", "\033[2m\033[1m", "\033[31m", "\033[34m", "\033[42m" };
 #endif
 
 /**

Modified: trunk/libmutil/source/ThreadPosix.cxx
===================================================================
--- trunk/libmutil/source/ThreadPosix.cxx	2007-05-12 14:17:00 UTC (rev 3278)
+++ trunk/libmutil/source/ThreadPosix.cxx	2007-05-21 09:01:14 UTC (rev 3279)
@@ -47,7 +47,7 @@
 
 using namespace std;
 
-ThreadException::ThreadException(char *desc):Exception(desc){
+ThreadException::ThreadException(const char *desc):Exception(desc){
 
 }
 

Modified: trunk/libmutil/source/ThreadWin32.cxx
===================================================================
--- trunk/libmutil/source/ThreadWin32.cxx	2007-05-12 14:17:00 UTC (rev 3278)
+++ trunk/libmutil/source/ThreadWin32.cxx	2007-05-21 09:01:14 UTC (rev 3279)
@@ -42,7 +42,7 @@
 
 using namespace std;
 
-ThreadException::ThreadException(char *desc):Exception(desc){
+ThreadException::ThreadException(const char *desc):Exception(desc){
 
 }
 

Modified: trunk/libmutil/source/massert.cxx
===================================================================
--- trunk/libmutil/source/massert.cxx	2007-05-12 14:17:00 UTC (rev 3278)
+++ trunk/libmutil/source/massert.cxx	2007-05-21 09:01:14 UTC (rev 3279)
@@ -8,7 +8,7 @@
 #include<stdio.h>
 #include<libmutil/Exception.h>
 
-void massertFailed(char *expr, char *file, char *baseFile, int line) {
+void massertFailed(const char *expr, const char *file, const char *baseFile, int line) {
 	if (!strcmp(file, baseFile)) {
 		fprintf(stderr,"massert(%s) failed in file %s, line %d\n", expr, file, line);
 	} else {