mod-c-cvs

[Gonzalo A. <ga...@us...>]

Update of /cvsroot/mod-c/ehtml/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv31644/src

Modified Files:
	Common.cpp DefaultSessionDriver.cpp DiskSessionDriver.cpp 
	Session.cpp 
Log Message:
* Removed harmless compiler warnings.


Index: DefaultSessionDriver.cpp
===================================================================
RCS file: /cvsroot/mod-c/ehtml/src/DefaultSessionDriver.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DefaultSessionDriver.cpp	13 Sep 2006 13:57:06 -0000	1.2
--- DefaultSessionDriver.cpp	13 Sep 2006 18:58:15 -0000	1.3
***************
*** 176,180 ****
      else if ( response.MsgType == DSS_CMD_STATUS )
      {
-         int retVal = EHTML_OK;
          switch (response.Type )
          {
--- 176,179 ----

Index: Common.cpp
===================================================================
RCS file: /cvsroot/mod-c/ehtml/src/Common.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Common.cpp	13 Sep 2006 18:38:24 -0000	1.11
--- Common.cpp	13 Sep 2006 18:58:15 -0000	1.12
***************
*** 343,347 ****
  	dev.reserve(mb.Size()*2+1);
  
! 	for (int i = 0; i < mb.Size(); ++i) {
  		char c = mb.Char()[i];
  		dev += h2c[(c >> 4) & 0x0f];
--- 343,347 ----
  	dev.reserve(mb.Size()*2+1);
  
! 	for (size_t i = 0; i < mb.Size(); ++i) {
  		char c = mb.Char()[i];
  		dev += h2c[(c >> 4) & 0x0f];
***************
*** 356,363 ****
  	MemBuf dev;
  	dev.resize(s.length()/2);
- 	char* obuf = dev.Char();
  	if (s.length() & 1)
  		throw "Invalid format";
! 	for (int i = 0; i < s.length(); ++i)
  		dev[i>>1] = GetByteFromHex(s[i], s[++i]);
  	return dev;
--- 356,362 ----
  	MemBuf dev;
  	dev.resize(s.length()/2);
  	if (s.length() & 1)
  		throw "Invalid format";
! 	for (size_t i = 0; i < s.length(); ++i)
  		dev[i>>1] = GetByteFromHex(s[i], s[++i]);
  	return dev;
***************
*** 443,447 ****
  		throw "Invalid base64 string.";
  	int ii = 0;
! 	int i = 0;
  	for (; i < s.length();) {
  		const char* in = s.c_str()+i;
--- 442,446 ----
  		throw "Invalid base64 string.";
  	int ii = 0;
! 	size_t i = 0;
  	for (; i < s.length();) {
  		const char* in = s.c_str()+i;

Index: Session.cpp
===================================================================
RCS file: /cvsroot/mod-c/ehtml/src/Session.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Session.cpp	13 Sep 2006 13:57:07 -0000	1.16
--- Session.cpp	13 Sep 2006 18:58:15 -0000	1.17
***************
*** 94,97 ****
--- 94,98 ----
  	_hex_set = 0;        _hex.clear();
  	_url_set = 0;    _urlencoded.clear();
+ 	return true;
  }
  
***************
*** 122,125 ****
--- 123,127 ----
  	_hex_set = 0;        _hex.clear();
  	_url_set = 0;    _urlencoded.clear();
+ 	return true;
  }
  
***************
*** 150,153 ****
--- 152,156 ----
  	_hex_set = 1;    _hex.clear();
  	_url_set = 0;    _urlencoded.clear();
+ 	return true;
  }
  
***************
*** 177,180 ****
--- 180,184 ----
  	_hex_set = 0;       _hex.clear();
  	_base64_set = 0;    _base64.clear();
+ 	return true;
  }
  

Index: DiskSessionDriver.cpp
===================================================================
RCS file: /cvsroot/mod-c/ehtml/src/DiskSessionDriver.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DiskSessionDriver.cpp	13 Sep 2006 13:57:06 -0000	1.4
--- DiskSessionDriver.cpp	13 Sep 2006 18:58:15 -0000	1.5
***************
*** 54,58 ****
  			return false;
  		struct dirent* de;
! 		while (de = readdir(dh)) {
  			string path = spool + " " + de->d_name;
  			struct stat st;
--- 54,58 ----
  			return false;
  		struct dirent* de;
! 		while ((de = readdir(dh))) {
  			string path = spool + " " + de->d_name;
  			struct stat st;
***************
*** 173,176 ****
--- 173,177 ----
  	unlink(filename(s->ID()).c_str());
  	unlink(locked_filename(s->ID()).c_str());
+ 	return true;
  }