r3365 - in trunk: libmcrypto/include/libmcrypto libmcrypto/source libmnetutil/include/libmnetutil libmnetutil/source
erik at minisip.org
erik at minisip.org
Tue Aug 14 16:13:33 CEST 2007
Author: erik
Date: 2007-08-14 16:13:32 +0200 (Tue, 14 Aug 2007)
New Revision: 3365
Modified:
trunk/libmcrypto/include/libmcrypto/CertificateFinder.h
trunk/libmcrypto/source/CertificateFinder.cxx
trunk/libmcrypto/source/CertificatePathFinderUcd.cxx
trunk/libmnetutil/include/libmnetutil/LdapUrl.h
trunk/libmnetutil/source/FileUrl.cxx
trunk/libmnetutil/source/HttpDownloader.cxx
trunk/libmnetutil/source/LdapDownloader.cxx
trunk/libmnetutil/source/LdapUrl.cxx
Log:
* Fixed warnings in new CertificateFinder* and Ldap/Downloader code
Modified: trunk/libmcrypto/include/libmcrypto/CertificateFinder.h
===================================================================
--- trunk/libmcrypto/include/libmcrypto/CertificateFinder.h 2007-08-13 11:18:56 UTC (rev 3364)
+++ trunk/libmcrypto/include/libmcrypto/CertificateFinder.h 2007-08-14 14:13:32 UTC (rev 3365)
@@ -54,7 +54,19 @@
class LIBMCRYPTO_API CertificateFinderStats : public MObject {
public:
- CertificateFinderStats() : ldapQueries (0), ldapQueriesNoResult (0), ldapQueriesNoDirectory (0), ldapCertsDownloaded (0), dnsQueries (0), dnsQueriesNoResult (0), dnsSrvQueries (0), dnsSrvQueriesNoResult (0), certsProcessed (0), certsUseful (0), cacheQueries (0), cacheQueriesNoResult (0) { }
+ CertificateFinderStats() : ldapQueries (0),
+ ldapQueriesNoResult (0),
+ ldapQueriesNoDirectory (0),
+ ldapCertsDownloaded (0),
+ dnsQueries (0),
+ dnsQueriesNoResult (0),
+ dnsSrvQueries (0),
+ dnsSrvQueriesNoResult (0),
+ cacheQueries (0),
+ cacheQueriesNoResult (0),
+ certsProcessed (0),
+ certsUseful (0)
+ { }
int ldapQueries;
int ldapQueriesNoResult;
Modified: trunk/libmcrypto/source/CertificateFinder.cxx
===================================================================
--- trunk/libmcrypto/source/CertificateFinder.cxx 2007-08-13 11:18:56 UTC (rev 3364)
+++ trunk/libmcrypto/source/CertificateFinder.cxx 2007-08-14 14:13:32 UTC (rev 3365)
@@ -237,7 +237,6 @@
std::vector<MRef<LdapEntry*> > result;
std::vector<MRef<LdapEntry*> >::iterator iter;
std::vector<std::string> attrs;
- int i=0;
std::cerr << " Base: " << base << std::endl;
try {
@@ -312,7 +311,7 @@
/*
Load/parse each retrieved certificate and test if they match the conditions.
*/
- for (int x=0; x<certs.size(); x++) {
+ for (size_t x=0; x<certs.size(); x++) {
MRef<LdapEntryBinaryValue*> val = certs.at(x);
cert = Certificate::load(reinterpret_cast<unsigned char*>(val->value), val->length);
Modified: trunk/libmcrypto/source/CertificatePathFinderUcd.cxx
===================================================================
--- trunk/libmcrypto/source/CertificatePathFinderUcd.cxx 2007-08-13 11:18:56 UTC (rev 3364)
+++ trunk/libmcrypto/source/CertificatePathFinderUcd.cxx 2007-08-14 14:13:32 UTC (rev 3365)
@@ -251,7 +251,7 @@
which of the candidates that should be tested first) exceed the number of
candidates then we should abort the function because there is nothing more to be done.
*/
- if (candidates.empty() || phaseEffort >= candidates.size()) {
+ if (candidates.empty() || phaseEffort >= (int)candidates.size()) {
phaseEffort = MAX_EFFORT;
findEffort = MAX_EFFORT;
break;
Modified: trunk/libmnetutil/include/libmnetutil/LdapUrl.h
===================================================================
--- trunk/libmnetutil/include/libmnetutil/LdapUrl.h 2007-08-13 11:18:56 UTC (rev 3364)
+++ trunk/libmnetutil/include/libmnetutil/LdapUrl.h 2007-08-14 14:13:32 UTC (rev 3365)
@@ -33,9 +33,9 @@
public:
LdapUrlExtension(std::string type, std::string value, bool critical) : type(type), value(value), critical(critical) {}
- bool critical;
std::string type;
std::string value;
+ bool critical;
};
/**
Modified: trunk/libmnetutil/source/FileUrl.cxx
===================================================================
--- trunk/libmnetutil/source/FileUrl.cxx 2007-08-13 11:18:56 UTC (rev 3364)
+++ trunk/libmnetutil/source/FileUrl.cxx 2007-08-14 14:13:32 UTC (rev 3365)
@@ -67,7 +67,7 @@
std::vector<std::string> parts = split(path, false, sep, true);
// Glue together each "path part" again
- for (int i=0; i<parts.size(); i++) {
+ for (size_t i=0; i<parts.size(); i++) {
std::string decPart = percentEncode(parts.at(i));
url += decPart + '/';
}
@@ -96,7 +96,7 @@
}
void FileUrl::setUrl(const std::string url) {
- std::string::size_type lastPos = 0, pos = 0, posTemp = 0;
+ std::string::size_type lastPos = 0, pos = 0;
if (strCaseCmp(url.substr(0, 7).c_str(), "file://") == 0) {
lastPos = 7;
@@ -126,7 +126,7 @@
std::vector<std::string> parts = split(restOfUrl, false, '/', true);
// Glue the pieces together using an operating-system specific separator
- for (int i=0; i<parts.size(); i++) {
+ for (size_t i=0; i<parts.size(); i++) {
std::string decPart = percentDecode(parts.at(i));
if (type == FILEURL_TYPE_WINDOWS) {
path += decPart + '\\';
@@ -226,7 +226,7 @@
std::string FileUrl::percentEncode(const std::string & in, bool escapeComma, bool escapeQuestionmark) const {
std::string res;
- for (int i=0; i < in.length(); i++) {
+ for (size_t i=0; i < in.length(); i++) {
if ((!isReservedChar(in[i]) && !isUnreservedChar(in[i])) || (escapeQuestionmark && in[i] == '?') || (escapeComma && in[i] == ','))
res += encodeChar(in[i]);
else
@@ -236,7 +236,7 @@
}
std::string FileUrl::percentDecode(const std::string & in) const {
std::string res;
- for (int i=0; i < in.length(); i++) {
+ for (size_t i=0; i < in.length(); i++) {
if ('%' == in[i]) {
res += decodeChar(in.substr(i, 3));
i+=2;
@@ -245,3 +245,4 @@
}
return res;
}
+
Modified: trunk/libmnetutil/source/HttpDownloader.cxx
===================================================================
--- trunk/libmnetutil/source/HttpDownloader.cxx 2007-08-13 11:18:56 UTC (rev 3364)
+++ trunk/libmnetutil/source/HttpDownloader.cxx 2007-08-14 14:13:32 UTC (rev 3365)
@@ -115,7 +115,7 @@
if (bytesWritten < 0) {
//cerr << "Error: Could not send request" << endl;
return false;
- } else if (bytesWritten < request.length()) {
+ } else if (bytesWritten < (int32_t)request.length()) {
return false;
}
Modified: trunk/libmnetutil/source/LdapDownloader.cxx
===================================================================
--- trunk/libmnetutil/source/LdapDownloader.cxx 2007-08-13 11:18:56 UTC (rev 3364)
+++ trunk/libmnetutil/source/LdapDownloader.cxx 2007-08-14 14:13:32 UTC (rev 3365)
@@ -103,7 +103,7 @@
try {
std::vector< MRef<LdapEntryBinaryValue*> > binaryData = entry->getAttrValuesBinary(attr);
- for (int i=0; i<binaryData.size(); i++) {
+ for (size_t i=0; i<binaryData.size(); i++) {
std::string fileName = nextFilename(filenameBase, i+1);
std::ofstream file(fileName.c_str());
if (file.good()) {
Modified: trunk/libmnetutil/source/LdapUrl.cxx
===================================================================
--- trunk/libmnetutil/source/LdapUrl.cxx 2007-08-13 11:18:56 UTC (rev 3364)
+++ trunk/libmnetutil/source/LdapUrl.cxx 2007-08-14 14:13:32 UTC (rev 3365)
@@ -69,7 +69,7 @@
// Append attributes
url += '?';
if (attributes.size() > 0) {
- for (int i=0; i<attributes.size(); i++) {
+ for (size_t i=0; i<attributes.size(); i++) {
if (i>0)
url += ',';
url += percentEncode(attributes.at(i), false, true);
@@ -89,7 +89,7 @@
// Append extensions
if (extensions.size() > 0) {
url += '?';
- for (int i=0; i<extensions.size(); i++) {
+ for (size_t i=0; i<extensions.size(); i++) {
if (i>0)
url += ',';
@@ -160,7 +160,7 @@
switch (parts.size()) {
case 5: {
std::vector<std::string> exts = split(parts.at(4), false, ',', true);
- for (int i=0; i<exts.size(); i++) {
+ for (size_t i=0; i<exts.size(); i++) {
std::string ext = exts.at(i);
std::string::size_type colonPos = ext.find('=', 0);
bool critical = (ext[0] == '!');
@@ -187,7 +187,7 @@
case 2:
attributes = split(parts.at(1), false, ',', true);
- for (int i=0; i<attributes.size(); i++) {
+ for (size_t i=0; i<attributes.size(); i++) {
attributes.at(i) = percentDecode(attributes.at(i));
}
case 1:
@@ -208,11 +208,11 @@
std::cerr << " Port: [" << port << "]" << std::endl;
std::cerr << " Attributes: " << std::endl;
- for (int i=0; i<attributes.size(); i++)
+ for (size_t i=0; i<attributes.size(); i++)
std::cerr << " [" << attributes.at(i) << "]" << std::endl;
std::cerr << " Extensions: " << std::endl;
- for (int i=0; i<extensions.size(); i++)
+ for (size_t i=0; i<extensions.size(); i++)
std::cerr << " [" << extensions.at(i).type << "=" << extensions.at(i).value << "]" << (extensions.at(i).critical ? " (critical!)" : "") << std::endl;
std::cerr << " Filter: [" << filter << "]" << std::endl;
@@ -223,7 +223,7 @@
}
bool LdapUrl::hasCriticalExtension() const {
- for (int i=0; i<extensions.size(); i++)
+ for (size_t i=0; i<extensions.size(); i++)
if (extensions.at(i).critical)
return true;
return false;
@@ -304,7 +304,7 @@
std::string LdapUrl::percentEncode(const std::string & in, bool escapeComma, bool escapeQuestionmark) const {
std::string res;
- for (int i=0; i < in.length(); i++) {
+ for (size_t i=0; i < in.length(); i++) {
if ((!isReservedChar(in[i]) && !isUnreservedChar(in[i])) || (escapeQuestionmark && in[i] == '?') || (escapeComma && in[i] == ','))
res += encodeChar(in[i]);
else
@@ -314,7 +314,7 @@
}
std::string LdapUrl::percentDecode(const std::string & in) const {
std::string res;
- for (int i=0; i < in.length(); i++) {
+ for (size_t i=0; i < in.length(); i++) {
if ('%' == in[i]) {
res += decodeChar(in.substr(i, 3));
i+=2;
More information about the Minisip-devel
mailing list