fix malformed init/return values
authorMichael Andres <ma@suse.de>
Mon, 29 Aug 2011 09:44:12 +0000 (11:44 +0200)
committerMichael Andres <ma@suse.de>
Mon, 29 Aug 2011 09:44:12 +0000 (11:44 +0200)
zypp/Digest.cc
zypp/media/CurlConfig.cc

index fcbe997..380d08c 100644 (file)
@@ -169,12 +169,12 @@ namespace zypp {
     std::string Digest::digest()
     {
       if(!_dp->maybeInit())
-       return false;
+       return std::string();
 
       if(!_dp->finalized)
       {
        if(!EVP_DigestFinal_ex(&_dp->mdctx, _dp->md_value, &_dp->md_len))
-           return false;
+           return std::string();
 
        _dp->finalized = true;
       }
@@ -197,11 +197,11 @@ namespace zypp {
         return r;
 
       if(!_dp->finalized)
-      {   
+      {
         if(!EVP_DigestFinal_ex(&_dp->mdctx, _dp->md_value, &_dp->md_len))
             return r;
         _dp->finalized = true;
-      }   
+      }
       r.reserve(_dp->md_len);
       for(unsigned i = 0; i < _dp->md_len; ++i)
        r.push_back(_dp->md_value[i]);
index 80dfcf4..1c59d1a 100644 (file)
@@ -45,7 +45,7 @@ namespace zypp
     }
     else
     {
-      char buf[32] = {NULL};
+      char buf[32] = "";
       WAR << "Not allowed to parse '" << curlrcFile
           << "': dir/file owner: " << h_info.owner() << "/" << c_info.owner()
           << ", process uid: " << getuid()