(file_init): Avoid shadowing ret (and thus avoiding crashing).
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17532 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -415,9 +415,9 @@ file_init(hx509_context context,
|
|||||||
const char *residue, hx509_lock lock)
|
const char *residue, hx509_lock lock)
|
||||||
{
|
{
|
||||||
char *files = NULL, *p, *pnext;
|
char *files = NULL, *p, *pnext;
|
||||||
int ret;
|
|
||||||
struct ks_file *f = NULL;
|
struct ks_file *f = NULL;
|
||||||
struct hx509_collector *c;
|
struct hx509_collector *c;
|
||||||
|
int ret;
|
||||||
|
|
||||||
*data = NULL;
|
*data = NULL;
|
||||||
|
|
||||||
@@ -456,7 +456,6 @@ file_init(hx509_context context,
|
|||||||
if (!found_data) {
|
if (!found_data) {
|
||||||
size_t length;
|
size_t length;
|
||||||
void *data;
|
void *data;
|
||||||
int ret;
|
|
||||||
|
|
||||||
ret = _hx509_map_file(p, &data, &length, NULL);
|
ret = _hx509_map_file(p, &data, &length, NULL);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
@@ -480,7 +479,6 @@ out:
|
|||||||
free(files);
|
free(files);
|
||||||
|
|
||||||
_hx509_collector_free(c);
|
_hx509_collector_free(c);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user