From dd043cd501bb3acff0e5f2ec1262bf862d9a68c5 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sat, 31 May 2008 18:55:23 +0000 Subject: [PATCH] Stop const mismatch warning in VC++. --- apps/apps.c | 16 ++++++++-------- apps/apps.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/apps.c b/apps/apps.c index 9d59ee4dcd..926edd0e9e 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -1477,7 +1477,7 @@ char *make_config_name() return p; } -static unsigned long index_serial_hash(const STRING *a) +static unsigned long index_serial_hash(const CSTRING *a) { const char *n; @@ -1486,7 +1486,7 @@ static unsigned long index_serial_hash(const STRING *a) return(lh_strhash(n)); } -static int index_serial_cmp(const STRING *a, const STRING *b) +static int index_serial_cmp(const CSTRING *a, const CSTRING *b) { const char *aa,*bb; @@ -1498,16 +1498,16 @@ static int index_serial_cmp(const STRING *a, const STRING *b) static int index_name_qual(char **a) { return(a[0][0] == 'V'); } -static unsigned long index_name_hash(const STRING *a) +static unsigned long index_name_hash(const CSTRING *a) { return(lh_strhash(a[DB_name])); } -int index_name_cmp(const STRING *a, const STRING *b) +int index_name_cmp(const CSTRING *a, const CSTRING *b) { return(strcmp(a[DB_name], b[DB_name])); } -static IMPLEMENT_LHASH_HASH_FN(index_serial, STRING) -static IMPLEMENT_LHASH_COMP_FN(index_serial, STRING) -static IMPLEMENT_LHASH_HASH_FN(index_name, STRING) -static IMPLEMENT_LHASH_COMP_FN(index_name, STRING) +static IMPLEMENT_LHASH_HASH_FN(index_serial, CSTRING) +static IMPLEMENT_LHASH_COMP_FN(index_serial, CSTRING) +static IMPLEMENT_LHASH_HASH_FN(index_name, CSTRING) +static IMPLEMENT_LHASH_COMP_FN(index_name, CSTRING) #undef BSIZE #define BSIZE 256 diff --git a/apps/apps.h b/apps/apps.h index 55e3f26213..6b7ff550d2 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -294,7 +294,7 @@ int index_index(CA_DB *db); int save_index(const char *dbfile, const char *suffix, CA_DB *db); int rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix); void free_index(CA_DB *db); -int index_name_cmp(const STRING *a, const STRING *b); +int index_name_cmp(const CSTRING *a, const CSTRING *b); int parse_yesno(const char *str, int def); X509_NAME *parse_name(char *str, long chtype, int multirdn); -- 2.25.1