diff options
Diffstat (limited to 'src/lib/libcrypto/txt_db/txt_db.c')
-rw-r--r-- | src/lib/libcrypto/txt_db/txt_db.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/txt_db/txt_db.c b/src/lib/libcrypto/txt_db/txt_db.c index 3b04fe280c..e6334d6add 100644 --- a/src/lib/libcrypto/txt_db/txt_db.c +++ b/src/lib/libcrypto/txt_db/txt_db.c | |||
@@ -155,7 +155,7 @@ TXT_DB *TXT_DB_read(BIO *in, int num) | |||
155 | *(p++)='\0'; | 155 | *(p++)='\0'; |
156 | if ((n != num) || (*f != '\0')) | 156 | if ((n != num) || (*f != '\0')) |
157 | { | 157 | { |
158 | #if !defined(NO_STDIO) && !defined(WIN16) /* temporaty fix :-( */ | 158 | #if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) /* temporaty fix :-( */ |
159 | fprintf(stderr,"wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",ln,num,n,f); | 159 | fprintf(stderr,"wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",ln,num,n,f); |
160 | #endif | 160 | #endif |
161 | er=2; | 161 | er=2; |
@@ -164,7 +164,7 @@ TXT_DB *TXT_DB_read(BIO *in, int num) | |||
164 | pp[n]=p; | 164 | pp[n]=p; |
165 | if (!sk_push(ret->data,(char *)pp)) | 165 | if (!sk_push(ret->data,(char *)pp)) |
166 | { | 166 | { |
167 | #if !defined(NO_STDIO) && !defined(WIN16) /* temporaty fix :-( */ | 167 | #if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) /* temporaty fix :-( */ |
168 | fprintf(stderr,"failure in sk_push\n"); | 168 | fprintf(stderr,"failure in sk_push\n"); |
169 | #endif | 169 | #endif |
170 | er=2; | 170 | er=2; |
@@ -176,7 +176,7 @@ err: | |||
176 | BUF_MEM_free(buf); | 176 | BUF_MEM_free(buf); |
177 | if (er) | 177 | if (er) |
178 | { | 178 | { |
179 | #if !defined(NO_STDIO) && !defined(WIN16) | 179 | #if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) |
180 | if (er == 1) fprintf(stderr,"OPENSSL_malloc failure\n"); | 180 | if (er == 1) fprintf(stderr,"OPENSSL_malloc failure\n"); |
181 | #endif | 181 | #endif |
182 | if (ret->data != NULL) sk_free(ret->data); | 182 | if (ret->data != NULL) sk_free(ret->data); |
@@ -211,7 +211,7 @@ char **TXT_DB_get_by_index(TXT_DB *db, int idx, char **value) | |||
211 | } | 211 | } |
212 | 212 | ||
213 | int TXT_DB_create_index(TXT_DB *db, int field, int (*qual)(), | 213 | int TXT_DB_create_index(TXT_DB *db, int field, int (*qual)(), |
214 | unsigned long (*hash)(), int (*cmp)()) | 214 | LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp) |
215 | { | 215 | { |
216 | LHASH *idx; | 216 | LHASH *idx; |
217 | char *r; | 217 | char *r; |