This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push: new 786285c1ae Forgot the code cleanup 786285c1ae is described below commit 786285c1ae2479c5dc020326a911d3fe020e845c Author: remm <r...@apache.org> AuthorDate: Tue Jan 2 14:13:36 2024 +0100 Forgot the code cleanup --- .../util/openssl/PEM_read_bio_PrivateKey$cb.java | 21 +++++++-------------- .../util/openssl/PEM_read_bio_X509_AUX$cb.java | 21 +++++++-------------- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/java/org/apache/tomcat/util/openssl/PEM_read_bio_PrivateKey$cb.java b/java/org/apache/tomcat/util/openssl/PEM_read_bio_PrivateKey$cb.java index a753174b69..7c7303dd4e 100644 --- a/java/org/apache/tomcat/util/openssl/PEM_read_bio_PrivateKey$cb.java +++ b/java/org/apache/tomcat/util/openssl/PEM_read_bio_PrivateKey$cb.java @@ -19,29 +19,22 @@ package org.apache.tomcat.util.openssl; +import java.lang.foreign.Arena; +import java.lang.foreign.FunctionDescriptor; +import java.lang.foreign.Linker; +import java.lang.foreign.MemorySegment; import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; -import java.lang.invoke.VarHandle; -import java.nio.ByteOrder; -import java.lang.foreign.*; -import static java.lang.foreign.ValueLayout.*; /** - * {@snippet lang=c : - * int (*PEM_read_bio_PrivateKey$cb)(char* buf,int size,int rwflag,void* userdata); + * {@snippet lang = c : * int (*PEM_read_bio_PrivateKey$cb)(char* buf,int size,int rwflag,void* userdata); * } */ public interface PEM_read_bio_PrivateKey$cb { int apply(MemorySegment buf, int size, int rwflag, MemorySegment userdata); - FunctionDescriptor $DESC = FunctionDescriptor.of( - openssl_h.C_INT, - openssl_h.C_POINTER, - openssl_h.C_INT, - openssl_h.C_INT, - openssl_h.C_POINTER - ); + FunctionDescriptor $DESC = FunctionDescriptor.of(openssl_h.C_INT, openssl_h.C_POINTER, openssl_h.C_INT, + openssl_h.C_INT, openssl_h.C_POINTER); MethodHandle UP$MH = openssl_h.upcallHandle(PEM_read_bio_PrivateKey$cb.class, "apply", $DESC); diff --git a/java/org/apache/tomcat/util/openssl/PEM_read_bio_X509_AUX$cb.java b/java/org/apache/tomcat/util/openssl/PEM_read_bio_X509_AUX$cb.java index be273cf02d..a04ac3200d 100644 --- a/java/org/apache/tomcat/util/openssl/PEM_read_bio_X509_AUX$cb.java +++ b/java/org/apache/tomcat/util/openssl/PEM_read_bio_X509_AUX$cb.java @@ -19,29 +19,22 @@ package org.apache.tomcat.util.openssl; +import java.lang.foreign.Arena; +import java.lang.foreign.FunctionDescriptor; +import java.lang.foreign.Linker; +import java.lang.foreign.MemorySegment; import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; -import java.lang.invoke.VarHandle; -import java.nio.ByteOrder; -import java.lang.foreign.*; -import static java.lang.foreign.ValueLayout.*; /** - * {@snippet lang=c : - * int (*PEM_read_bio_X509_AUX$cb)(char* buf,int size,int rwflag,void* userdata); + * {@snippet lang = c : * int (*PEM_read_bio_X509_AUX$cb)(char* buf,int size,int rwflag,void* userdata); * } */ public interface PEM_read_bio_X509_AUX$cb { int apply(MemorySegment buf, int size, int rwflag, MemorySegment userdata); - FunctionDescriptor $DESC = FunctionDescriptor.of( - openssl_h.C_INT, - openssl_h.C_POINTER, - openssl_h.C_INT, - openssl_h.C_INT, - openssl_h.C_POINTER - ); + FunctionDescriptor $DESC = FunctionDescriptor.of(openssl_h.C_INT, openssl_h.C_POINTER, openssl_h.C_INT, + openssl_h.C_INT, openssl_h.C_POINTER); MethodHandle UP$MH = openssl_h.upcallHandle(PEM_read_bio_X509_AUX$cb.class, "apply", $DESC); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org