projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add restart/force-reload options to init script
[onak.git]
/
mem.c
diff --git
a/mem.c
b/mem.c
index 5ba9090b08cd52b507b9cb77ca02865004481071..47f296744d3e1c25e93c8cafd5aeaed913d03297 100644
(file)
--- a/
mem.c
+++ b/
mem.c
@@
-100,8
+100,6
@@
void free_packet(struct openpgp_packet *packet) {
void free_packet_list(struct openpgp_packet_list *packet_list) {
struct openpgp_packet_list *nextpacket = NULL;
void free_packet_list(struct openpgp_packet_list *packet_list) {
struct openpgp_packet_list *nextpacket = NULL;
- log_assert(packet_list != NULL);
-
while (packet_list != NULL) {
nextpacket = packet_list->next;
if (packet_list->packet != NULL) {
while (packet_list != NULL) {
nextpacket = packet_list->next;
if (packet_list->packet != NULL) {
@@
-123,8
+121,6
@@
void free_signedpacket_list(
struct openpgp_signedpacket_list *signedpacket_list) {
struct openpgp_signedpacket_list *nextpacket = NULL;
struct openpgp_signedpacket_list *signedpacket_list) {
struct openpgp_signedpacket_list *nextpacket = NULL;
- log_assert(signedpacket_list != NULL);
-
while (signedpacket_list != NULL) {
nextpacket = signedpacket_list->next;
if (signedpacket_list->packet != NULL) {
while (signedpacket_list != NULL) {
nextpacket = signedpacket_list->next;
if (signedpacket_list->packet != NULL) {
@@
-148,17
+144,15
@@
void free_signedpacket_list(
void free_publickey(struct openpgp_publickey *key) {
struct openpgp_publickey *nextkey = NULL;
void free_publickey(struct openpgp_publickey *key) {
struct openpgp_publickey *nextkey = NULL;
- log_assert(key != NULL);
-
while (key != NULL) {
nextkey = key->next;
if (key->publickey != NULL) {
free_packet(key->publickey);
key->publickey = NULL;
}
while (key != NULL) {
nextkey = key->next;
if (key->publickey != NULL) {
free_packet(key->publickey);
key->publickey = NULL;
}
- if (key->
revocation
s != NULL) {
- free_packet_list(key->
revocation
s);
- key->
revocation
s = NULL;
+ if (key->
sig
s != NULL) {
+ free_packet_list(key->
sig
s);
+ key->
sig
s = NULL;
}
if (key->uids != NULL) {
free_signedpacket_list(key->uids);
}
if (key->uids != NULL) {
free_signedpacket_list(key->uids);