summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2024-12-28 16:10:39 +0000
committertb <>2024-12-28 16:10:39 +0000
commit1dcfd9f7169326293f4eea2ac4d8937b6203f987 (patch)
treef5de7ad05397318b5a96961a3f253cbf08b37f27
parentbae218658a20a862ba8738d3fbf90172048f4741 (diff)
downloadopenbsd-1dcfd9f7169326293f4eea2ac4d8937b6203f987.tar.gz
openbsd-1dcfd9f7169326293f4eea2ac4d8937b6203f987.tar.bz2
openbsd-1dcfd9f7169326293f4eea2ac4d8937b6203f987.zip
stack: inline internal_find() in sk_find()
internal_find() was a generalization needed for sk_find_ex(), which was removed a while ago. ok jsing
-rw-r--r--src/lib/libcrypto/stack/stack.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/lib/libcrypto/stack/stack.c b/src/lib/libcrypto/stack/stack.c
index 60a302afc2..3967bedfe4 100644
--- a/src/lib/libcrypto/stack/stack.c
+++ b/src/lib/libcrypto/stack/stack.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: stack.c,v 1.28 2024/03/02 11:20:36 tb Exp $ */ 1/* $OpenBSD: stack.c,v 1.29 2024/12/28 16:10:39 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -233,8 +233,8 @@ obj_bsearch_ex(const void *key, const void *base_, int num, int size,
233 return (p); 233 return (p);
234} 234}
235 235
236static int 236int
237internal_find(_STACK *st, void *data, int ret_val_options) 237sk_find(_STACK *st, void *data)
238{ 238{
239 const void * const *r; 239 const void * const *r;
240 int i; 240 int i;
@@ -252,17 +252,11 @@ internal_find(_STACK *st, void *data, int ret_val_options)
252 if (data == NULL) 252 if (data == NULL)
253 return (-1); 253 return (-1);
254 r = obj_bsearch_ex(&data, st->data, st->num, sizeof(void *), st->comp, 254 r = obj_bsearch_ex(&data, st->data, st->num, sizeof(void *), st->comp,
255 ret_val_options); 255 OBJ_BSEARCH_FIRST_VALUE_ON_MATCH);
256 if (r == NULL) 256 if (r == NULL)
257 return (-1); 257 return (-1);
258 return (int)((char **)r - st->data); 258 return (int)((char **)r - st->data);
259} 259}
260
261int
262sk_find(_STACK *st, void *data)
263{
264 return internal_find(st, data, OBJ_BSEARCH_FIRST_VALUE_ON_MATCH);
265}
266LCRYPTO_ALIAS(sk_find); 260LCRYPTO_ALIAS(sk_find);
267 261
268int 262int