From 1dcfd9f7169326293f4eea2ac4d8937b6203f987 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sat, 28 Dec 2024 16:10:39 +0000
Subject: 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
---
 src/lib/libcrypto/stack/stack.c | 14 ++++----------
 1 file 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 @@
-/* $OpenBSD: stack.c,v 1.28 2024/03/02 11:20:36 tb Exp $ */
+/* $OpenBSD: stack.c,v 1.29 2024/12/28 16:10:39 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -233,8 +233,8 @@ obj_bsearch_ex(const void *key, const void *base_, int num, int size,
 	return (p);
 }
 
-static int
-internal_find(_STACK *st, void *data, int ret_val_options)
+int
+sk_find(_STACK *st, void *data)
 {
 	const void * const *r;
 	int i;
@@ -252,17 +252,11 @@ internal_find(_STACK *st, void *data, int ret_val_options)
 	if (data == NULL)
 		return (-1);
 	r = obj_bsearch_ex(&data, st->data, st->num, sizeof(void *), st->comp,
-	    ret_val_options);
+	    OBJ_BSEARCH_FIRST_VALUE_ON_MATCH);
 	if (r == NULL)
 		return (-1);
 	return (int)((char **)r - st->data);
 }
-
-int
-sk_find(_STACK *st, void *data)
-{
-	return internal_find(st, data, OBJ_BSEARCH_FIRST_VALUE_ON_MATCH);
-}
 LCRYPTO_ALIAS(sk_find);
 
 int
-- 
cgit v1.2.3-55-g6feb