declare some functions static + some type fixes
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2144 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
176323ac03
commit
c30494a942
|
@ -549,7 +549,7 @@ const char *lookup_enum_spec(enum_spec *spec, CK_ULONG value)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
const char *lookup_enum(CK_LONG type, CK_ULONG value)
|
||||
const char *lookup_enum(CK_ULONG type, CK_ULONG value)
|
||||
{
|
||||
CK_ULONG i;
|
||||
for(i = 0; ck_types[i].type < ( sizeof(ck_types) / sizeof(enum_spec) ) ; i++) {
|
||||
|
|
|
@ -33,20 +33,20 @@ typedef void (display_func) \
|
|||
(FILE *, CK_LONG, CK_VOID_PTR, CK_ULONG, CK_VOID_PTR);
|
||||
|
||||
typedef struct {
|
||||
CK_LONG type;
|
||||
char * name;
|
||||
CK_ULONG type;
|
||||
const char *name;
|
||||
} enum_specs;
|
||||
|
||||
typedef struct {
|
||||
CK_LONG type;
|
||||
CK_ULONG type;
|
||||
enum_specs *specs;
|
||||
CK_ULONG size;
|
||||
char *name;
|
||||
CK_ULONG size;
|
||||
const char *name;
|
||||
} enum_spec;
|
||||
|
||||
typedef struct {
|
||||
CK_LONG type;
|
||||
char * name;
|
||||
CK_ULONG type;
|
||||
const char * name;
|
||||
display_func* display;
|
||||
void * arg;
|
||||
} type_spec;
|
||||
|
@ -62,7 +62,7 @@ enum ck_type{
|
|||
};
|
||||
|
||||
const char *lookup_enum_spec(enum_spec *spec, CK_ULONG value);
|
||||
const char *lookup_enum(CK_LONG type, CK_ULONG value);
|
||||
const char *lookup_enum(CK_ULONG type, CK_ULONG value);
|
||||
void print_enum (FILE *f, CK_LONG type, CK_VOID_PTR value, CK_ULONG size, CK_VOID_PTR arg);
|
||||
void print_boolean (FILE *f, CK_LONG type, CK_VOID_PTR value, CK_ULONG size, CK_VOID_PTR arg);
|
||||
void print_generic (FILE *f, CK_LONG type, CK_VOID_PTR value, CK_ULONG size, CK_VOID_PTR arg);
|
||||
|
|
|
@ -48,7 +48,7 @@ FILE *spy_output = NULL;
|
|||
pkcs11_spy->name = name;
|
||||
|
||||
/* Inits the spy. If successfull, po != NULL */
|
||||
CK_RV init_spy(void)
|
||||
static CK_RV init_spy(void)
|
||||
{
|
||||
const char *mspec = NULL, *file = NULL, *env = NULL;
|
||||
scconf_block *conf_block = NULL, **blocks;
|
||||
|
@ -109,66 +109,66 @@ CK_RV init_spy(void)
|
|||
return rv;
|
||||
}
|
||||
|
||||
void enter(char *function)
|
||||
static void enter(const char *function)
|
||||
{
|
||||
static int count = 0;
|
||||
fprintf(spy_output, "\n\n%d: %s\n", count++, function);
|
||||
}
|
||||
|
||||
CK_RV retne(CK_RV rv)
|
||||
static CK_RV retne(CK_RV rv)
|
||||
{
|
||||
fprintf(spy_output, "Returned: %ld %s\n", rv, lookup_enum ( RV_T, rv ));
|
||||
fflush(spy_output);
|
||||
return rv;
|
||||
}
|
||||
|
||||
void spy_dump_string_in(char *name, CK_VOID_PTR data, CK_ULONG size)
|
||||
static void spy_dump_string_in(const char *name, CK_VOID_PTR data, CK_ULONG size)
|
||||
{
|
||||
fprintf(spy_output, "[in] %s ", name);
|
||||
print_generic(spy_output, 0, data, size, NULL);
|
||||
}
|
||||
|
||||
void spy_dump_string_out(char *name, CK_VOID_PTR data, CK_ULONG size)
|
||||
static void spy_dump_string_out(const char *name, CK_VOID_PTR data, CK_ULONG size)
|
||||
{
|
||||
fprintf(spy_output, "[out] %s ", name);
|
||||
print_generic(spy_output, 0, data, size, NULL);
|
||||
}
|
||||
|
||||
void spy_dump_ulong_in(char *name, CK_ULONG value)
|
||||
static void spy_dump_ulong_in(const char *name, CK_ULONG value)
|
||||
{
|
||||
fprintf(spy_output, "[in] %s = 0x%lx\n", name, value);
|
||||
}
|
||||
|
||||
void spy_dump_ulong_out(char *name, CK_ULONG value)
|
||||
static void spy_dump_ulong_out(const char *name, CK_ULONG value)
|
||||
{
|
||||
fprintf(spy_output, "[out] %s = 0x%lx\n", name, value);
|
||||
}
|
||||
|
||||
void spy_dump_desc_out(char *name)
|
||||
static void spy_dump_desc_out(const char *name)
|
||||
{
|
||||
fprintf(spy_output, "[out] %s: \n", name);
|
||||
}
|
||||
|
||||
void spy_dump_array_out(char *name, CK_ULONG size)
|
||||
static void spy_dump_array_out(const char *name, CK_ULONG size)
|
||||
{
|
||||
fprintf(spy_output, "[out] %s[%ld]: \n", name, size);
|
||||
}
|
||||
|
||||
void spy_attribute_req_in(char *name, CK_ATTRIBUTE_PTR pTemplate,
|
||||
static void spy_attribute_req_in(const char *name, CK_ATTRIBUTE_PTR pTemplate,
|
||||
CK_ULONG ulCount)
|
||||
{
|
||||
fprintf(spy_output, "[in] %s[%ld]: \n", name, ulCount);
|
||||
print_attribute_list_req(spy_output, pTemplate, ulCount);
|
||||
}
|
||||
|
||||
void spy_attribute_list_in(char *name, CK_ATTRIBUTE_PTR pTemplate,
|
||||
static void spy_attribute_list_in(const char *name, CK_ATTRIBUTE_PTR pTemplate,
|
||||
CK_ULONG ulCount)
|
||||
{
|
||||
fprintf(spy_output, "[in] %s[%ld]: \n", name, ulCount);
|
||||
print_attribute_list(spy_output, pTemplate, ulCount);
|
||||
}
|
||||
|
||||
void spy_attribute_list_out(char *name, CK_ATTRIBUTE_PTR pTemplate,
|
||||
static void spy_attribute_list_out(const char *name, CK_ATTRIBUTE_PTR pTemplate,
|
||||
CK_ULONG ulCount)
|
||||
{
|
||||
fprintf(spy_output, "[out] %s[%ld]: \n", name, ulCount);
|
||||
|
|
Loading…
Reference in New Issue