Page MenuHome GnuPG
Files F34240923

No OneTemporary
Actions

View Options

diff --git a/importresult.cpp b/importresult.cpp
index 3a11b132..909ba034 100644
--- a/importresult.cpp
+++ b/importresult.cpp
@@ -1,188 +1,186 @@
/*
importresult.cpp - wraps a gpgme import result
Copyright (C) 2004 Klarälvdalens Datakonsult AB
This file is part of GPGME++.
GPGME++ is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
GPGME++ is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with GPGME++; see the file COPYING.LIB. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#include <gpgme++/config-gpgme++.h>
#include <gpgme++/importresult.h>
#include "result_p.h"
#include <gpgme.h>
#include <cstdlib>
#include <cstring>
#include <string.h>
class GpgME::ImportResult::Private {
public:
Private( const _gpgme_op_import_result & r ) : res( r ) {
// copy recursively, using compiler-generated copy ctor.
// We just need to handle the pointers in the structs:
for ( gpgme_import_status_t is = r.imports ; is ; is = is->next ) {
gpgme_import_status_t copy = new _gpgme_import_status( *is );
copy->fpr = strdup( is->fpr );
copy->next = 0;
imports.push_back( copy );
}
res.imports = 0;
}
~Private() {
for ( std::vector<gpgme_import_status_t>::iterator it = imports.begin() ; it != imports.end() ; ++it ) {
std::free( (*it)->fpr );
delete *it; *it = 0;
}
}
_gpgme_op_import_result res;
std::vector<gpgme_import_status_t> imports;
};
GpgME::ImportResult::ImportResult( gpgme_ctx_t ctx, int error )
: GpgME::Result( error ), d()
{
- if ( error || !ctx )
- return;
init( ctx );
}
GpgME::ImportResult::ImportResult( gpgme_ctx_t ctx, const Error & error )
: GpgME::Result( error ), d()
{
- if ( error || !ctx )
- return;
init( ctx );
}
void GpgME::ImportResult::init( gpgme_ctx_t ctx ) {
+ if ( !ctx )
+ return;
gpgme_import_result_t res = gpgme_op_import_result( ctx );
if ( !res )
return;
d.reset( new Private( *res ) );
}
make_standard_stuff(ImportResult)
int GpgME::ImportResult::numConsidered() const {
return d ? d->res.considered : 0 ;
}
int GpgME::ImportResult::numKeysWithoutUserID() const {
return d ? d->res.no_user_id : 0 ;
}
int GpgME::ImportResult::numImported() const {
return d ? d->res.imported : 0 ;
}
int GpgME::ImportResult::numRSAImported() const {
return d ? d->res.imported_rsa : 0 ;
}
int GpgME::ImportResult::numUnchanged() const {
return d ? d->res.unchanged : 0 ;
}
int GpgME::ImportResult::newUserIDs() const {
return d ? d->res.new_user_ids : 0 ;
}
int GpgME::ImportResult::newSubkeys() const {
return d ? d->res.new_sub_keys : 0 ;
}
int GpgME::ImportResult::newSignatures() const {
return d ? d->res.new_signatures : 0 ;
}
int GpgME::ImportResult::newRevocations() const {
return d ? d->res.new_revocations : 0 ;
}
int GpgME::ImportResult::numSecretKeysConsidered() const {
return d ? d->res.secret_read : 0 ;
}
int GpgME::ImportResult::numSecretKeysImported() const {
return d ? d->res.secret_imported : 0 ;
}
int GpgME::ImportResult::numSecretKeysUnchanged() const {
return d ? d->res.secret_unchanged : 0 ;
}
int GpgME::ImportResult::notImported() const {
return d ? d->res.not_imported : 0 ;
}
GpgME::Import GpgME::ImportResult::import( unsigned int idx ) const {
return Import( d, idx );
}
std::vector<GpgME::Import> GpgME::ImportResult::imports() const {
if ( !d )
return std::vector<Import>();
std::vector<Import> result;
result.reserve( d->imports.size() );
for ( unsigned int i = 0 ; i < d->imports.size() ; ++i )
result.push_back( Import( d, i ) );
return result;
}
GpgME::Import::Import( const boost::shared_ptr<ImportResult::Private> & parent, unsigned int i )
: d( parent ), idx( i )
{
}
GpgME::Import::Import() : d(), idx( 0 ) {}
bool GpgME::Import::isNull() const {
return !d || idx >= d->imports.size() ;
}
const char * GpgME::Import::fingerprint() const {
return isNull() ? 0 : d->imports[idx]->fpr ;
}
GpgME::Error GpgME::Import::error() const {
return Error( isNull() ? 0 : d->imports[idx]->result );
}
GpgME::Import::Status GpgME::Import::status() const {
if ( isNull() )
return Unknown;
const unsigned int s = d->imports[idx]->status;
unsigned int result = Unknown;
if ( s & GPGME_IMPORT_NEW ) result |= NewKey;
if ( s & GPGME_IMPORT_UID ) result |= NewUserIDs;
if ( s & GPGME_IMPORT_SIG ) result |= NewSignatures;
if ( s & GPGME_IMPORT_SUBKEY ) result |= NewSubkeys;
if ( s & GPGME_IMPORT_SECRET ) result |= ContainedSecretKey;
return static_cast<Status>( result );
}
diff --git a/keygenerationresult.cpp b/keygenerationresult.cpp
index 7761237b..90c2238c 100644
--- a/keygenerationresult.cpp
+++ b/keygenerationresult.cpp
@@ -1,85 +1,83 @@
/*
keygenerationresult.cpp - wraps a gpgme keygen result
Copyright (C) 2004 Klarälvdalens Datakonsult AB
This file is part of GPGME++.
GPGME++ is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
GPGME++ is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with GPGME++; see the file COPYING.LIB. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#include <gpgme++/config-gpgme++.h>
#include <gpgme++/keygenerationresult.h>
#include "result_p.h"
#include <gpgme.h>
#include <cstring>
#include <cstdlib>
#include <string.h>
class GpgME::KeyGenerationResult::Private {
public:
Private( const _gpgme_op_genkey_result & r ) : res( r ) {
if ( res.fpr )
res.fpr = strdup( res.fpr );
}
~Private() {
if ( res.fpr )
std::free( res.fpr );
res.fpr = 0;
}
_gpgme_op_genkey_result res;
};
GpgME::KeyGenerationResult::KeyGenerationResult( gpgme_ctx_t ctx, int error )
: GpgME::Result( error ), d()
{
- if ( error || !ctx )
- return;
init( ctx );
}
GpgME::KeyGenerationResult::KeyGenerationResult( gpgme_ctx_t ctx, const Error & error )
: GpgME::Result( error ), d()
{
- if ( error || !ctx )
- return;
init( ctx );
}
void GpgME::KeyGenerationResult::init( gpgme_ctx_t ctx ) {
+ if ( !ctx )
+ return;
gpgme_genkey_result_t res = gpgme_op_genkey_result( ctx );
if ( !res )
return;
d.reset( new Private( *res ) );
}
make_standard_stuff(KeyGenerationResult)
bool GpgME::KeyGenerationResult::isPrimaryKeyGenerated() const {
return d && d->res.primary;
}
bool GpgME::KeyGenerationResult::isSubkeyGenerated() const {
return d && d->res.sub;
}
const char * GpgME::KeyGenerationResult::fingerprint() const {
return d ? d->res.fpr : 0 ;
}
diff --git a/keylistresult.cpp b/keylistresult.cpp
index 25ce5edd..69ef54b5 100644
--- a/keylistresult.cpp
+++ b/keylistresult.cpp
@@ -1,100 +1,98 @@
/*
keylistresult.cpp - wraps a gpgme keylist result
Copyright (C) 2004 Klarälvdalens Datakonsult AB
This file is part of GPGME++.
GPGME++ is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
GPGME++ is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with GPGME++; see the file COPYING.LIB. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#include <gpgme++/config-gpgme++.h>
#include <gpgme++/keylistresult.h>
#include "result_p.h"
#include <gpgme.h>
#include <cstring>
#include <cassert>
class GpgME::KeyListResult::Private {
public:
Private( const _gpgme_op_keylist_result & r ) : res( r ) {}
Private( const Private & other ) : res( other.res ) {}
_gpgme_op_keylist_result res;
};
GpgME::KeyListResult::KeyListResult( gpgme_ctx_t ctx, int error )
: GpgME::Result( error ), d()
{
- if ( error || !ctx )
- return;
init( ctx );
}
GpgME::KeyListResult::KeyListResult( gpgme_ctx_t ctx, const Error & error )
: GpgME::Result( error ), d()
{
- if ( error || !ctx )
- return;
init( ctx );
}
void GpgME::KeyListResult::init( gpgme_ctx_t ctx ) {
+ if ( !ctx )
+ return;
gpgme_keylist_result_t res = gpgme_op_keylist_result( ctx );
if ( !res )
return;
d.reset( new Private( *res ) );
}
GpgME::KeyListResult::KeyListResult( const Error & error, const _gpgme_op_keylist_result & res )
: GpgME::Result( error ), d( new Private( res ) )
{
}
make_standard_stuff(KeyListResult)
void GpgME::KeyListResult::detach() {
if ( !d || d.unique() )
return;
d.reset( new Private( *d ) );
}
void GpgME::KeyListResult::mergeWith( const KeyListResult & other ) {
if ( other.isNull() )
return;
if ( isNull() ) { // just assign
operator=( other );
return;
}
// merge the truncated flag (try to keep detaching to a minimum):
if ( other.isTruncated() && !this->isTruncated() ) {
assert( other.d );
detach();
if ( !d )
d.reset( new Private( *other.d ) );
else
d->res.truncated = true;
}
if ( ! bool(error()) ) // only merge the error when there was none yet.
Result::operator=( other );
}
bool GpgME::KeyListResult::isTruncated() const {
return d && d->res.truncated;
}

File Metadata

Mime Type
text/x-diff
Expires
Tue, Dec 23, 3:08 PM (6 h, 25 m)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
d5/e8/8455bc46b13f1bf896350ee0ae49

Event Timeline