use setup_call_cleanup/3 for with_locals

as suggested by triska

diff --git a/src/lib/ffi.pl b/src/lib/ffi.pl
index ab981e82928121d4cc9257177b0534da9bf76454..86c7bdc97c6897f191d4faf71096587203a8f23e 100644 (file)
--- a/src/lib/ffi.pl
+++ b/src/lib/ffi.pl
@@ -54,6 +54,7 @@ And a new window should pop up!
 :- use_module(library(error)).
 :- use_module(library(format)).
 :- use_module(library(dcgs)).
+:- use_module(library(iso_ext)).
 
 %% foreign_struct(+Name, +Elements).
 %
@@ -144,9 +145,10 @@ array_type(ElemType, Len, ArrayType) :-
 
 with_locals(Locals, Goal) :-
     verify_locals(Locals),
-    allocate_locals(Locals),
-    ( catch(Goal, E, (deallocate_locals(Locals), throw(E))) -> deallocate_locals(Locals)
-    ; deallocate_locals(Locals), false
+    setup_call_cleanup(
+        allocate_locals(Locals),
+        Goal,
+        deallocate_locals(Locals)
     ).
 
 verify_locals(Locals) :-