[Gcblue-commits] gcb_wx/src/database md5class.cpp, 1.2, 1.3 tcDatabaseObject.cpp, 1.24, 1.25

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/src/database
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv10463/src/database

Modified Files:
	md5class.cpp tcDatabaseObject.cpp 
Log Message:


Index: md5class.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/md5class.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** md5class.cpp	20 Nov 2006 00:17:40 -0000	1.2
--- md5class.cpp	28 Nov 2006 01:57:37 -0000	1.3
***************
*** 66,77 ****
  void CMD5::setPlainText(const char* plainText)
  {
!   //set plaintext with a mutator, it's ok to 
!   //to call this multiple times.  If casting away the const-ness of plainText 
!   //worries you, you could either make a local copy of the plain 
!   //text string instead of just pointing at the user's string, or 
!   //modify the RFC 1321 code to take 'const' plaintext, see example below. 
  
!   m_plainText = const_cast<char*>(plainText);
!   m_digestValid = calcDigest();
  }
  
--- 66,78 ----
  void CMD5::setPlainText(const char* plainText)
  {
!     //set plaintext with a mutator, it's ok to 
!     //to call this multiple times.  If casting away the const-ness of plainText 
!     //worries you, you could either make a local copy of the plain 
!     //text string instead of just pointing at the user's string, or 
!     //modify the RFC 1321 code to take 'const' plaintext, see example below. 
  
!     //  m_plainText = const_cast<char*>(plainText);
!     m_plainText = plainText;
!     m_digestValid = calcDigest();
  }
  
***************
*** 120,125 ****
    for (int i = 0; i<16; i++)
    {
! 	//::sprintf(&m_digestString[p],"%02x", m_digest[i]);
!     sprintf_s(&m_digestString[p], DIGEST_STRING_SIZE, "%02x", m_digest[i]);
  	p+=2;
    }
--- 121,126 ----
    for (int i = 0; i<16; i++)
    {
! 	::sprintf(&m_digestString[p],"%02x", m_digest[i]);
!     //sprintf_s(&m_digestString[p], DIGEST_STRING_SIZE, "%02x", m_digest[i]);
  	p+=2;
    }

Index: tcDatabaseObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabaseObject.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** tcDatabaseObject.cpp	20 Nov 2006 00:17:40 -0000	1.24
--- tcDatabaseObject.cpp	28 Nov 2006 01:57:37 -0000	1.25
***************
*** 98,101 ****
--- 98,102 ----
          case PTYPE_SMALLSURFACE:strcpy(azString,"Small surface");break;
          case PTYPE_LARGESURFACE:strcpy(azString,"Large surface");break;
+         case PTYPE_CARRIER:strcpy(azString,"Carrier");break;
          case PTYPE_AIR:strcpy(azString,"Air");break;
          case PTYPE_FIXEDWING:strcpy(azString,"Fixed-wing air"); break;