Improve the auto-generated bindings

JuliaWeb · Jan 5, 2024 · 98d9b43 · 98d9b43
1 parent 98d24b3
commit 98d9b43
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/gen/gen.jl b/gen/gen.jl
@@ -106,7 +106,7 @@ function rewrite!(ctx)
                 if name in string_functions
                     wrapper = quote
                         if ret == C_NULL
-                            return nothing
+                            throw(LibSSHException($("Error from $name, no string found (returned C_NULL)")))
                         else
                             return unsafe_string(Ptr{UInt8}(ret))
                         end
@@ -119,10 +119,19 @@ function rewrite!(ctx)
 
                 if !isnothing(wrapper)
                     wrapper_name = Symbol(chopprefix(string(name), "ssh_"))
-                    new_expr = quote
-                        function $wrapper_name($(args...))::$ret_type
-                            ret = $name($(args...))
-                            $wrapper
+                    new_expr = if isnothing(ret_type)
+                        quote
+                            function $wrapper_name($(args...))
+                                ret = $name($(args...))
+                                $wrapper
+                            end
+                        end
+                    else
+                        quote
+                            function $wrapper_name($(args...))::$ret_type
+                                ret = $name($(args...))
+                                $wrapper
+                            end
                         end
                     end
 

diff --git a/gen/prologue.jl b/gen/prologue.jl
@@ -1,2 +1,6 @@
 using libssh_jll
 using DocStringExtensions
+
+struct LibSSHException <: Exception
+    msg::String
+end
diff --git a/src/LibSSH.jl b/src/LibSSH.jl
@@ -8,13 +8,9 @@ using DocStringExtensions
 
 include("bindings.jl")
 using .lib
-import .lib: ssh_options_get, ssh_options_set, SSH_OK, SSH_ERROR, SSH_AGAIN, SSH_EOF
+import .lib: LibSSHException, ssh_options_get, ssh_options_set, SSH_OK, SSH_ERROR, SSH_AGAIN, SSH_EOF
 
 
-struct LibSSHException <: Exception
-    msg::String
-end
-
 @enum AuthMethod begin
     AuthMethod_Unknown = SSH_AUTH_METHOD_UNKNOWN
     AuthMethod_None = SSH_AUTH_METHOD_NONE

diff --git a/src/bindings.jl b/src/bindings.jl
@@ -5,6 +5,10 @@ using CEnum
 using libssh_jll
 using DocStringExtensions
 
+struct LibSSHException <: Exception
+    msg::String
+end
+
 
 const __uid_t = Cuint
 
@@ -4902,7 +4906,7 @@ Auto-generated wrapper around [`ssh_message_auth_user`](@ref).
 function message_auth_user(msg)::String
     ret = ssh_message_auth_user(msg)
     if ret == C_NULL
-        return nothing
+        throw(LibSSHException("Error from ssh_message_auth_user, no string found (returned C_NULL)"))
     else
         return unsafe_string(Ptr{UInt8}(ret))
     end
@@ -4916,7 +4920,7 @@ Auto-generated wrapper around [`ssh_message_auth_password`](@ref).
 function message_auth_password(msg)::String
     ret = ssh_message_auth_password(msg)
     if ret == C_NULL
-        return nothing
+        throw(LibSSHException("Error from ssh_message_auth_password, no string found (returned C_NULL)"))
     else
         return unsafe_string(Ptr{UInt8}(ret))
     end