taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

actually properly implement API wrt return value handling, even if not used today

Browse Source
This commit is contained in:
Christian Grothoff 2017-10-17 14:04:08 +02:00
parent e4fe0dc87e
commit 0346e37504
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/exchangedb/exchangedb_auditorkeys.c
View File

@ -1,6 +1,6 @@
/* /*
This file is part of TALER This file is part of TALER
Copyright (C) 2014, 2015, 2016 Inria & GNUnet e.V. Copyright (C) 2014, 2015, 2016, 2017 Inria & GNUnet e.V.
TALER is free software; you can redistribute it and/or modify it under the TALER is free software; you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software terms of the GNU General Public License as published by the Free Software
@ -40,6 +40,11 @@ struct AuditorIterateContext
* Closure for @e it. * Closure for @e it.
*/ */
void *it_cls; void *it_cls;
/**
* Status of the iteration.
*/
int status;
}; };
@ -94,6 +99,7 @@ auditor_iter (void *cls,
const char *auditor_url; const char *auditor_url;
unsigned int dki_len; unsigned int dki_len;
size_t url_len; size_t url_len;
int iret;
if (GNUNET_OK != GNUNET_DISK_file_size (filename, if (GNUNET_OK != GNUNET_DISK_file_size (filename,
&size, &size,
@ -160,14 +166,22 @@ auditor_iter (void *cls,
GNUNET_free (af); GNUNET_free (af);
return GNUNET_OK; return GNUNET_OK;
} }
/*Ignoring return value to not interrupt the iteration*/ /* Ignoring return value to not interrupt the iteration */
aic->it (aic->it_cls, if (GNUNET_OK !=
&af->apub, (iret = aic->it (aic->it_cls,
auditor_url, &af->apub,
&af->mpub, auditor_url,
dki_len, &af->mpub,
sigs, dki_len,
dki); sigs,
dki)))
{
GNUNET_free (af);
if (GNUNET_SYSERR == iret)
aic->status = GNUNET_SYSERR;
return GNUNET_SYSERR;
}
aic->status++;
GNUNET_free (af); GNUNET_free (af);
return GNUNET_OK; return GNUNET_OK;
} }
@ -201,10 +215,14 @@ TALER_EXCHANGEDB_auditor_iterate (const struct GNUNET_CONFIGURATION_Handle *cfg,
return -1; return -1;
aic.it = it; aic.it = it;
aic.it_cls = it_cls; aic.it_cls = it_cls;
aic.status = 0;
ret = GNUNET_DISK_directory_scan (auditor_base_dir, ret = GNUNET_DISK_directory_scan (auditor_base_dir,
&auditor_iter, &auditor_iter,
&aic); &aic);
GNUNET_free (auditor_base_dir); GNUNET_free (auditor_base_dir);
if ( (0 != aic.status) ||
(GNUNET_OK == ret) )
return aic.status;
return ret; return ret;
} }