- Minor cleanups and a warning fix
- sc_release_context: free ctx->preferred_language if set git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1565 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
28fcfde1fd
commit
e62eea5351
|
@ -431,6 +431,8 @@ int sc_release_context(struct sc_context *ctx)
|
|||
drv->ops->finish(ctx, ctx->reader_drv_data[i]);
|
||||
}
|
||||
ctx->debug_file = ctx->error_file = NULL;
|
||||
if (ctx->preferred_language)
|
||||
free(ctx->preferred_language);
|
||||
if (ctx->conf)
|
||||
scconf_free(ctx->conf);
|
||||
sc_mutex_free(ctx->mutex);
|
||||
|
|
|
@ -31,6 +31,7 @@ extern "C" {
|
|||
|
||||
#include "opensc.h"
|
||||
#include "log.h"
|
||||
#include "ui.h"
|
||||
#include <assert.h>
|
||||
|
||||
#define SC_FILE_MAGIC 0x14426950
|
||||
|
|
|
@ -34,7 +34,6 @@
|
|||
#ifdef HAVE_IO_H
|
||||
#include <io.h>
|
||||
#endif
|
||||
#include <opensc/ui.h>
|
||||
|
||||
#ifndef __GNUC__
|
||||
void sc_error(struct sc_context *ctx, const char *format, ...)
|
||||
|
|
|
@ -10,20 +10,13 @@
|
|||
* Copyright (C) 2003 Olaf Kirch <okir@lse.de>
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
#include "internal.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#include <opensc/opensc.h>
|
||||
#include <opensc/scdl.h>
|
||||
#include <opensc/log.h>
|
||||
#include <opensc/ui.h>
|
||||
#include "internal.h"
|
||||
|
||||
/*
|
||||
* We keep a global shared library handle here.
|
||||
|
|
Loading…
Reference in New Issue