r3274 - in trunk: libmcrypto/source libmcrypto/source/openssl libmcrypto/source/uuid libmikey/keyagreement libminisip/source/subsystem_signaling/sip libmsip/source

[cesc at minisip.org]

Author: cesc
Date: 2007-05-09 17:19:15 +0200 (Wed, 09 May 2007)
New Revision: 3274

Modified:
   trunk/libmcrypto/source/SipSimSoft.cxx
   trunk/libmcrypto/source/openssl/cert.cxx
   trunk/libmcrypto/source/uuid/uuid.cc
   trunk/libmikey/keyagreement/KeyAgreement.cxx
   trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoip.cxx
   trunk/libmsip/source/SipDialogConfig.cxx
Log:
Fix warnings when compiling with G++ 4.1.1 on Fedora Core 6 



Modified: trunk/libmcrypto/source/SipSimSoft.cxx
===================================================================
--- trunk/libmcrypto/source/SipSimSoft.cxx	2007-05-09 12:21:51 UTC (rev 3273)
+++ trunk/libmcrypto/source/SipSimSoft.cxx	2007-05-09 15:19:15 UTC (rev 3274)
@@ -27,5 +27,6 @@
 bool SipSimSoft::getRandomValue(unsigned char * randomPtr, unsigned long randomLength)
 {
 	Rand::randomize(randomPtr, randomLength);
+	return false;
 }
 

Modified: trunk/libmcrypto/source/openssl/cert.cxx
===================================================================
--- trunk/libmcrypto/source/openssl/cert.cxx	2007-05-09 12:21:51 UTC (rev 3273)
+++ trunk/libmcrypto/source/openssl/cert.cxx	2007-05-09 15:19:15 UTC (rev 3274)
@@ -420,7 +420,7 @@
 }
 
 void ossl_certificate::get_der( unsigned char * output, unsigned int * length ){
-	if( *length < get_der_length() ){
+	if( *length < (unsigned int)get_der_length() ){
  		throw certificate_exception(
 			"Given buffer is to short" );
 	}

Modified: trunk/libmcrypto/source/uuid/uuid.cc
===================================================================
--- trunk/libmcrypto/source/uuid/uuid.cc	2007-05-09 12:21:51 UTC (rev 3273)
+++ trunk/libmcrypto/source/uuid/uuid.cc	2007-05-09 15:19:15 UTC (rev 3274)
@@ -25,10 +25,14 @@
 #include <libmcrypto/rand.h>
 
 /* various forward declarations */
+#if 0
+     /* forward declarations used in an if 0 part below ... */
 static int read_state(unsigned16 *clockseq, uuid_time_t *timestamp,
     uuid_node_t *node);
 static void write_state(unsigned16 clockseq, uuid_time_t timestamp,
     uuid_node_t node);
+#endif
+
 static void format_uuid_v1(uuid_t *uuid, unsigned16 clockseq,
     uuid_time_t timestamp, uuid_node_t node);
 static void get_current_time(uuid_time_t *timestamp);
@@ -37,11 +41,9 @@
 /* uuid_create -- generator a UUID */
 int uuid_create(uuid_t *uuid)
 {
-     uuid_time_t timestamp, last_time;
+     uuid_time_t timestamp;
      unsigned16 clockseq;
      uuid_node_t node;
-     uuid_node_t last_node;
-     int f;
 
      /* acquire system-wide lock so we're alone */
      LOCK;
@@ -52,6 +54,9 @@
 #if 1
      clockseq = true_random();
 #else
+     uuid_time last_time;
+     uuid_node_t last_node;
+     int f;
      f = read_state(&clockseq, &last_time, &last_node);
 
      /* if no NV state, or if clock went backwards, or node ID

Modified: trunk/libmikey/keyagreement/KeyAgreement.cxx
===================================================================
--- trunk/libmikey/keyagreement/KeyAgreement.cxx	2007-05-09 12:21:51 UTC (rev 3273)
+++ trunk/libmikey/keyagreement/KeyAgreement.cxx	2007-05-09 15:19:15 UTC (rev 3274)
@@ -46,20 +46,22 @@
 }
 
 KeyAgreement::KeyAgreement():
+	useSim(false),
 	tgkPtr(NULL), tgkLengthValue(0),
 	randPtr(NULL), randLengthValue(0),
 	csbIdValue(0), 
-	csIdMapPtr(NULL), nCsValue(0), useSim(false){
+	csIdMapPtr(NULL), nCsValue(0) {
 	//policy = list<Policy_type *>::list();
 	kvPtr = new KeyValidityNull();
 
 }
 
 KeyAgreement::KeyAgreement(MRef<SipSim *> sim):
+	useSim(true),
 	tgkPtr(NULL), tgkLengthValue(0),
 	randPtr(NULL), randLengthValue(0),
 	csbIdValue(0), 
-	csIdMapPtr(NULL), nCsValue(0), useSim(true){
+	csIdMapPtr(NULL), nCsValue(0){
 		kvPtr = new KeyValidityNull();
 		this->sim = sim;
 }

Modified: trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoip.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoip.cxx	2007-05-09 12:21:51 UTC (rev 3273)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoip.cxx	2007-05-09 15:19:15 UTC (rev 3274)
@@ -587,8 +587,8 @@
 		SipDialog(stack,ident),
 		phoneconf(pconf),
 		mediaSession(mediaSession),
-		lastInvite(NULL),
-		notifyEarlyTermination(false)
+		notifyEarlyTermination(false),
+		lastInvite(NULL)
 {
 	if (cid=="")
 		dialogState.callId = itoa(rand())+"@"+getSipStack()->getStackConfig()->externalContactIP;

Modified: trunk/libmsip/source/SipDialogConfig.cxx
===================================================================
--- trunk/libmsip/source/SipDialogConfig.cxx	2007-05-09 12:21:51 UTC (rev 3273)
+++ trunk/libmsip/source/SipDialogConfig.cxx	2007-05-09 15:19:15 UTC (rev 3274)
@@ -91,7 +91,7 @@
 
 SipRegistrar::SipRegistrar(const SipUri &userUri, string transportParam) {
 	SipUri addr;
-	bool unknown = true;
+//	bool unknown = true; //unused
 	autodetectSettings = true;
 	
 	registerExpires=DEFAULT_SIPPROXY_EXPIRES_VALUE_SECONDS;