GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2001-11-21 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* gpgmeplug.c: Include config.h only if [HAVE_CONFIG_H].  Do not
	include util.h.
	(deinitialize): Use free, not _gpgme_free.
	(setDirectoryServers): Use calloc, not xtrycalloc.  Use free, not
	_gpgme_free.  Use malloc instead xtrymalloc.
	(appendDirectoryServer): Use realloc, not xtryrealloc.
This commit is contained in:
Marcus Brinkmann 2001-11-21 21:08:02 +00:00
parent 9cbf7e459c
commit adfc1ccd5d
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gpgmeplug/gpgmeplug.c
View File

@ -42,7 +42,9 @@
\see cryptplug.h \see cryptplug.h
*/ */
#ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -50,7 +52,6 @@
#include <errno.h> #include <errno.h>
#include <gpgme.h> #include <gpgme.h>
#include <util.h>
#include "cryptplug.h" #include "cryptplug.h"
@ -145,10 +146,10 @@ void deinitialize()
{ {
unsigned int i; unsigned int i;
for( i = 0; i < config.numDirectoryServers; ++i ) { for( i = 0; i < config.numDirectoryServers; ++i ) {
_gpgme_free( (char *)config.directoryServers[i].servername ); free( (char *)config.directoryServers[i].servername );
_gpgme_free( (char *)config.directoryServers[i].description ); free( (char *)config.directoryServers[i].description );
} }
_gpgme_free( config.directoryServers ); free( config.directoryServers );
} }
@ -584,17 +585,17 @@ void appendDirectoryServer( const char* servername,
const char* description ) const char* description )
{ {
struct DirectoryServer *newServers = NULL; struct DirectoryServer *newServers = NULL;
newServers = xtryrealloc( config.directoryServers, newServers = realloc( config.directoryServers,
(1+config.numDirectoryServers) * sizeof *newServers ); (1+config.numDirectoryServers) * sizeof *newServers );
if( newServers ) { if( newServers ) {
config.directoryServers = newServers; config.directoryServers = newServers;
newServers[ config.numDirectoryServers ].servername = newServers[ config.numDirectoryServers ].servername =
xtrymalloc( strlen( servername ) ); malloc( strlen( servername ) );
if( newServers[ config.numDirectoryServers ].servername ) { if( newServers[ config.numDirectoryServers ].servername ) {
strcpy( (char *)newServers[ config.numDirectoryServers ].servername, strcpy( (char *)newServers[ config.numDirectoryServers ].servername,
servername ); servername );
newServers[ config.numDirectoryServers ].description = newServers[ config.numDirectoryServers ].description =
xtrymalloc( strlen( description ) ); malloc( strlen( description ) );
if( newServers[ config.numDirectoryServers ].description ) { if( newServers[ config.numDirectoryServers ].description ) {
strcpy( (char *)newServers[ config.numDirectoryServers ].description, strcpy( (char *)newServers[ config.numDirectoryServers ].description,
description ); description );
@ -610,18 +611,18 @@ void setDirectoryServers( struct DirectoryServer server[], unsigned int size )
unsigned int i; unsigned int i;
int oldSize = config.numDirectoryServers; int oldSize = config.numDirectoryServers;
struct DirectoryServer *newServers = NULL; struct DirectoryServer *newServers = NULL;
newServers = xtrycalloc ( size, sizeof *newServers ); newServers = calloc ( size, sizeof *newServers );
if( newServers ) { if( newServers ) {
for( i=0; i < oldSize; ++i ) { for( i=0; i < oldSize; ++i ) {
_gpgme_free( (char *)config.directoryServers[i].servername ); free( (char *)config.directoryServers[i].servername );
_gpgme_free( (char *)config.directoryServers[i].description ); free( (char *)config.directoryServers[i].description );
} }
_gpgme_free( config.directoryServers ); free( config.directoryServers );
for( i=0; i < size; ++i ) { for( i=0; i < size; ++i ) {
newServers[ i ].servername = xtrymalloc( strlen( server[i].servername ) ); newServers[ i ].servername = malloc( strlen( server[i].servername ) );
if( newServers[ i ].servername ) { if( newServers[ i ].servername ) {
strcpy( (char *)newServers[ i ].servername, server[i].servername ); strcpy( (char *)newServers[ i ].servername, server[i].servername );
newServers[ i ].description = xtrymalloc( strlen( server[i].description ) ); newServers[ i ].description = malloc( strlen( server[i].description ) );
if( newServers[ i ].description ) { if( newServers[ i ].description ) {
strcpy( (char *)newServers[ i ].description, server[i].description ); strcpy( (char *)newServers[ i ].description, server[i].description );
newServers[ i ].port = server[i].port; newServers[ i ].port = server[i].port;