Index: openssl/crypto/txt_db/txt_db.h |
=================================================================== |
--- openssl/crypto/txt_db/txt_db.h (revision 105093) |
+++ openssl/crypto/txt_db/txt_db.h (working copy) |
@@ -77,16 +77,19 @@ |
extern "C" { |
#endif |
+typedef OPENSSL_STRING *OPENSSL_PSTRING; |
+DECLARE_SPECIAL_STACK_OF(OPENSSL_PSTRING, OPENSSL_STRING) |
+ |
typedef struct txt_db_st |
{ |
int num_fields; |
- STACK /* char ** */ *data; |
- LHASH **index; |
- int (**qual)(char **); |
+ STACK_OF(OPENSSL_PSTRING) *data; |
+ LHASH_OF(OPENSSL_STRING) **index; |
+ int (**qual)(OPENSSL_STRING *); |
long error; |
long arg1; |
long arg2; |
- char **arg_row; |
+ OPENSSL_STRING *arg_row; |
} TXT_DB; |
#ifndef OPENSSL_NO_BIO |
@@ -96,11 +99,11 @@ |
TXT_DB *TXT_DB_read(char *in, int num); |
long TXT_DB_write(char *out, TXT_DB *db); |
#endif |
-int TXT_DB_create_index(TXT_DB *db,int field,int (*qual)(char **), |
- LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp); |
+int TXT_DB_create_index(TXT_DB *db,int field,int (*qual)(OPENSSL_STRING *), |
+ LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp); |
void TXT_DB_free(TXT_DB *db); |
-char **TXT_DB_get_by_index(TXT_DB *db, int idx, char **value); |
-int TXT_DB_insert(TXT_DB *db,char **value); |
+OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, OPENSSL_STRING *value); |
+int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *value); |
#ifdef __cplusplus |
} |