1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00

Converted all m_free to xfree etc.

This commit is contained in:
Werner Koch 2005-07-27 18:10:56 +00:00
parent cd570629b2
commit a1cdf3c75f
112 changed files with 2067 additions and 1813 deletions

View file

@ -37,7 +37,7 @@
void
free_symkey_enc( PKT_symkey_enc *enc )
{
m_free(enc);
xfree(enc);
}
void
@ -49,7 +49,7 @@ free_pubkey_enc( PKT_pubkey_enc *enc )
mpi_free(enc->data[0]);
for(i=0; i < n; i++ )
mpi_free( enc->data[i] );
m_free(enc);
xfree(enc);
}
void
@ -63,10 +63,10 @@ free_seckey_enc( PKT_signature *sig )
for(i=0; i < n; i++ )
mpi_free( sig->data[i] );
m_free(sig->revkey);
m_free(sig->hashed);
m_free(sig->unhashed);
m_free(sig);
xfree(sig->revkey);
xfree(sig->hashed);
xfree(sig->unhashed);
xfree(sig);
}
@ -82,7 +82,7 @@ release_public_key_parts( PKT_public_key *pk )
pk->pkey[i] = NULL;
}
if (pk->prefs) {
m_free (pk->prefs);
xfree (pk->prefs);
pk->prefs = NULL;
}
if (pk->user_id) {
@ -90,7 +90,7 @@ release_public_key_parts( PKT_public_key *pk )
pk->user_id = NULL;
}
if (pk->revkey) {
m_free(pk->revkey);
xfree(pk->revkey);
pk->revkey=NULL;
pk->numrevkeys=0;
}
@ -101,7 +101,7 @@ void
free_public_key( PKT_public_key *pk )
{
release_public_key_parts( pk );
m_free(pk);
xfree(pk);
}
@ -112,7 +112,7 @@ cp_subpktarea (subpktarea_t *s )
if( !s )
return NULL;
d = m_alloc (sizeof (*d) + s->size - 1 );
d = xmalloc (sizeof (*d) + s->size - 1 );
d->size = s->size;
d->len = s->len;
memcpy (d->data, s->data, s->len);
@ -133,7 +133,7 @@ copy_prefs (const prefitem_t *prefs)
for (n=0; prefs[n].type; n++)
;
new = m_alloc ( sizeof (*new) * (n+1));
new = xmalloc ( sizeof (*new) * (n+1));
for (n=0; prefs[n].type; n++) {
new[n].type = prefs[n].type;
new[n].value = prefs[n].value;
@ -151,7 +151,7 @@ copy_public_key ( PKT_public_key *d, PKT_public_key *s)
int n, i;
if( !d )
d = m_alloc(sizeof *d);
d = xmalloc(sizeof *d);
memcpy( d, s, sizeof *d );
d->user_id = scopy_user_id (s->user_id);
d->prefs = copy_prefs (s->prefs);
@ -165,7 +165,7 @@ copy_public_key ( PKT_public_key *d, PKT_public_key *s)
if( !s->revkey && s->numrevkeys )
BUG();
if( s->numrevkeys ) {
d->revkey = m_alloc(sizeof(struct revocation_key)*s->numrevkeys);
d->revkey = xmalloc(sizeof(struct revocation_key)*s->numrevkeys);
memcpy(d->revkey,s->revkey,sizeof(struct revocation_key)*s->numrevkeys);
}
else
@ -201,7 +201,7 @@ copy_signature( PKT_signature *d, PKT_signature *s )
int n, i;
if( !d )
d = m_alloc(sizeof *d);
d = xmalloc(sizeof *d);
memcpy( d, s, sizeof *d );
n = pubkey_get_nsig( s->pubkey_algo );
if( !n )
@ -253,7 +253,7 @@ void
free_secret_key( PKT_secret_key *sk )
{
release_secret_key_parts( sk );
m_free(sk);
xfree(sk);
}
PKT_secret_key *
@ -262,7 +262,7 @@ copy_secret_key( PKT_secret_key *d, PKT_secret_key *s )
int n, i;
if( !d )
d = m_alloc(sizeof *d);
d = xmalloc(sizeof *d);
else
release_secret_key_parts (d);
memcpy( d, s, sizeof *d );
@ -280,14 +280,14 @@ copy_secret_key( PKT_secret_key *d, PKT_secret_key *s )
void
free_comment( PKT_comment *rem )
{
m_free(rem);
xfree(rem);
}
void
free_attributes(PKT_user_id *uid)
{
m_free(uid->attribs);
m_free(uid->attrib_data);
xfree(uid->attribs);
xfree(uid->attrib_data);
uid->attribs=NULL;
uid->attrib_data=NULL;
@ -302,9 +302,9 @@ free_user_id (PKT_user_id *uid)
return;
free_attributes(uid);
m_free (uid->prefs);
m_free (uid->namehash);
m_free (uid);
xfree (uid->prefs);
xfree (uid->namehash);
xfree (uid);
}
void
@ -316,7 +316,7 @@ free_compressed( PKT_compressed *zd )
while( iobuf_read( zd->buf, NULL, 1<<30 ) != -1 )
;
}
m_free(zd);
xfree(zd);
}
void
@ -337,7 +337,7 @@ free_encrypted( PKT_encrypted *ed )
}
}
}
m_free(ed);
xfree(ed);
}
@ -359,7 +359,7 @@ free_plaintext( PKT_plaintext *pt )
}
}
}
m_free(pt);
xfree(pt);
}
/****************
@ -409,7 +409,7 @@ free_packet( PACKET *pkt )
free_plaintext( pkt->pkt.plaintext );
break;
default:
m_free( pkt->pkt.generic );
xfree( pkt->pkt.generic );
break;
}
pkt->pkt.generic = NULL;