[SCM] Debian packaging for libntl - Number Theory Library branch, master, updated. 725690a74333b49e1096467192cc414183237986
Bernhard R. Link
brlink at debian.org
Fri Feb 3 21:15:29 UTC 2012
The following commit has been merged in the master branch:
commit 657ad2a8f5e44518df3907208157303dae478898
Author: Felix Salfelder <salfelder at em.cs.uni-frankfurt.de>
Date: Thu Jan 26 21:34:21 2012 +0100
a callback for sage
(from sage-4.7.tar/spkg/ntl/dist/debian)
We add a SetErrorCallbackFunction(). This sets a global callback function _function_,
which gets called with parameter _context_ and an error message string whenever Error()
gets called.
Note that if the custom error handler *returns*, then NTL will dump the error message
back to stderr and abort() as it habitually does.
-- David Harvey (2008-04-12)
diff --git a/include/NTL/tools.h b/include/NTL/tools.h
index 3f32fe7..c4708e8 100644
--- a/include/NTL/tools.h
+++ b/include/NTL/tools.h
@@ -252,6 +252,12 @@ long CharToIntVal(long c);
char IntValToChar(long a);
+/*
+ This function is not present in vanilla NTL 5.4.2.
+ See tools.c for documentation.
+ */
+void SetErrorCallbackFunction(void (*func)(const char *s, void *context), void *context);
+
void Error(const char *s);
diff --git a/src/tools.c b/src/tools.c
index c617ae1..86af374 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -18,8 +18,35 @@ NTL_START_IMPL
void (*ErrorCallback)() = 0;
+/*
+ The following code differs from vanilla NTL 5.4.2.
+
+ We add a SetErrorCallbackFunction(). This sets a global callback function _function_,
+ which gets called with parameter _context_ and an error message string whenever Error()
+ gets called.
+
+ Note that if the custom error handler *returns*, then NTL will dump the error message
+ back to stderr and abort() as it habitually does.
+
+ -- David Harvey (2008-04-12)
+*/
+
+void (*ErrorCallbackFunction)(const char*, void*) = NULL;
+void *ErrorCallbackContext = NULL;
+
+
+void SetErrorCallbackFunction(void (*function)(const char*, void*), void *context)
+{
+ ErrorCallbackFunction = function;
+ ErrorCallbackContext = context;
+}
+
+
void Error(const char *s)
{
+ if (ErrorCallbackFunction != NULL)
+ ErrorCallbackFunction(s, ErrorCallbackContext);
+
cerr << s << "\n";
_ntl_abort();
}
--
Debian packaging for libntl - Number Theory Library
More information about the debian-science-commits
mailing list