(puremodule.c): New module which exports the Purify and Quantify C API

to Python.  Minimal documentation is included in comments at the top
of the file, and in the Misc/PURIFY.README file.  Note that this
module must be statically linked since Pure doesn't provide shared
stubs libraries.

(Setup.in): Added commented template for pure module

(syslogmodule.c): ins() function wasn't declared static.

3 files changed, 1169 insertions, 4 deletions

diff --git a/Modules/Setup.in b/Modules/Setup.in
index c9becb2..94f0c4b 100644
--- a/Modules/Setup.in
+++ b/Modules/Setup.in
@@ -101,6 +101,13 @@ signal signalmodule.c		# signal(2)
 
 #thread threadmodule.c
 
+# Pure module.  Cannot be linked dynamically.
+# -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE
+#WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE
+#PURE_INCLS=-I/usr/local/include
+#PURE_STUBLIBS=-L/usr/local/lib -lpurify_stubs -lquantify_stubs
+#pure puremodule.c $(WHICH_PURE_PRODUCTS) $(PURE_INCLS) $(PURE_STUBLIBS)
+
 # Uncommenting the following line tells makesetup that all following
 # modules are to be built as shared libraries (see above for more
 # detail):
diff --git a/Modules/puremodule.c b/Modules/puremodule.c
new file mode 100644
index 0000000..ee80a2f
--- /dev/null
+++ b/Modules/puremodule.c
@@ -0,0 +1,1155 @@
+/* This module exports the C API to such Pure Software Inc. (tm) (now
+ * called Pure Atria Corporation) products as Purify (tm) and Quantify
+ * (tm).  Other packages could be added, but I didn't have those products
+ * and thus lack the API documentation.
+ *
+ * Currently supported: Quantify 2.x, Purify 3.x
+ *
+ * You need to decide which products you want to incorporate into the
+ * module when you compile this file.  The way to do this is to edit
+ * <Python>/Modules/Setup to pass the appropriate flags to the compiler.
+ * -DWITH_PURIFY compiles in the Purify support, and -DWITH_QUANTIFY
+ * compiles in the Quantify support.  -DWITH_ALL_PURE compiles in both.
+ * You can also build a Purify'd or Quantify'd interpreter by passing in
+ * the LINKCC variable to make.  E.g. if you want to build a Purify'd
+ * interpreter and are using gcc, build Python with this command:
+ *
+ * make LINKCC='purify gcc'
+ *
+ * It would be nice (and probably easy) to provide this file as a shared
+ * library, however since it doesn't appear that Pure gives us shared
+ * libraries of the stubs, it doesn't really matter.  For now, you have to
+ * link this file in statically.
+ *
+ * Major bogosity.  The purify.h header file exports purify_exit(), but
+ * guess what?  It is not defined in the libpurify_stubs.a file!  I tried
+ * to fake one here, hoping the Pure linker would Do The Right Thing when
+ * instrumented for Purify, but it doesn't seem to, so I don't export
+ * purify_exit() to the Python layer.  In Python you should raise a
+ * SystemExit exception anyway.
+ *
+ * The actual purify.h and quantify.h files which embody the APIs are
+ * copyrighted by Pure Software, Inc. and are only attainable through them.
+ * This module assumes you have legally installed licenses of their
+ * software.  Contact them on the Web via <http://www.pureatria.com/>
+ *
+ * Author: Barry Warsaw <bwarsaw@python.org>
+ *                      <bwarsaw@cnri.reston.va.us>
+ */
+
+#include "Python.h"
+
+#if defined(WITH_PURIFY) || defined(WITH_ALL_PURE)
+#    include <purify.h>
+#    define HAS_PURIFY_EXIT 0                /* See note at top of file */
+#    define PURE_PURIFY_VERSION 3            /* not provided by purify.h */
+#endif
+#if defined(WITH_QUANTIFY) || defined(WITH_ALL_PURE)
+#    include <quantify.h>
+#    define PURE_QUANTIFY_VERSION 2          /* not provided by quantify.h */
+#endif
+#if defined(PURIFY_H) || defined(QUANTIFY_H)
+#    define COMMON_PURE_FUNCTIONS
+#endif /* PURIFY_H || QUANTIFY_H */
+
+typedef int (*VoidArgFunc)(void);
+typedef int (*StringArgFunc)(char*);
+typedef int (*PrintfishFunc)(const char*, ...);
+typedef int (*StringIntArgFunc)(const char*, int);
+
+
+
+static PyObject*
+call_voidarg_function(func, self, args)
+	VoidArgFunc func;
+	PyObject *self;
+	PyObject *args;
+{
+	int status;
+
+	if (!PyArg_ParseTuple(args, ""))
+		return NULL;
+
+	status = func();
+	return Py_BuildValue("i", status);
+}
+
+static PyObject*
+call_stringarg_function(func, self, args)
+	StringArgFunc func;
+	PyObject *self;
+	PyObject *args;
+{
+	int status;
+	char* stringarg;
+
+	if (!PyArg_ParseTuple(args, "s", &stringarg))
+		return NULL;
+
+	status = func(stringarg);
+	return Py_BuildValue("i", status);
+}
+
+static PyObject*
+call_stringorint_function(func, self, args)
+	StringArgFunc func;
+	PyObject *self;
+	PyObject *args;
+{
+	int status;
+	int intarg;
+	char* stringarg;
+
+        /* according to the quantify.h file, the argument to
+         * quantify_*_recording_system_call can be an integer or a string,
+	 * but the functions are prototyped as taking a single char*
+	 * argument. Yikes!
+         */
+	if (PyArg_ParseTuple(args, "i", &intarg))
+		/* func is prototyped as int(*)(char*)
+		 * better shut up the compiler
+		 */
+		status = func((char*)intarg);
+
+	else {
+		PyErr_Clear();
+		if (!PyArg_ParseTuple(args, "s", &stringarg))
+			return NULL;
+		else
+			status = func(stringarg);
+	}
+	return Py_BuildValue("i", status);
+}
+
+static PyObject*
+call_printfish_function(func, self, args)
+	PrintfishFunc func;
+	PyObject *self;
+	PyObject *args;
+{
+	/* we support the printf() style vararg functions by requiring the
+         * formatting be done in Python.  At the C level we pass just a string
+         * to the printf() style function.
+         */
+	int status;
+	char* argstring;
+
+	if (!PyArg_ParseTuple(args, "s", &argstring))
+		return NULL;
+
+	status = func("%s", argstring);
+	return Py_BuildValue("i", status);
+}
+
+static PyObject*
+call_intasaddr_function(func, self, args)
+	StringArgFunc func;
+	PyObject *self;
+	PyObject *args;
+{
+	long memrep;
+	int id;
+
+	if (!PyArg_ParseTuple(args, "l", &memrep))
+		return NULL;
+
+	id = func((char*)memrep);
+	return Py_BuildValue("i", id);
+}
+
+static PyObject*
+call_stringandint_function(func, self, args)
+	StringIntArgFunc func;
+	PyObject *self;
+	PyObject *args;
+{
+	long srcrep;
+	int size;
+	int status;
+
+	if (!PyArg_ParseTuple(args, "li", &srcrep, &size))
+		return NULL;
+
+	status = func((char*)srcrep, size);
+	return Py_BuildValue("i", status);
+}
+
+
+
+/* functions common to all products
+ *
+ * N.B. These printf() style functions are a bit of a kludge.  Since the
+ * API doesn't provide vprintf versions of them, we can't call them
+ * directly.  They don't support all the standard printf % modifiers
+ * anyway.  The way to use these is to use Python's % string operator to do
+ * the formatting.  By the time these functions get the thing to print,
+ * it's already a string, and they just use "%s" as the format string.
+ */
+
+#ifdef COMMON_PURE_FUNCTIONS
+
+static PyObject*
+pure_pure_logfile_printf(PyObject* self, PyObject* args)
+{
+	return call_printfish_function(pure_logfile_printf, self, args);
+}
+
+static PyObject*
+pure_pure_printf(PyObject* self, PyObject* args)
+{
+	return call_printfish_function(pure_printf, self, args);
+}
+
+static PyObject*
+pure_pure_printf_with_banner(PyObject* self, PyObject* args)
+{
+	return call_printfish_function(pure_printf_with_banner, self, args);
+}
+
+
+#endif /* COMMON_PURE_FUNCTIONS */
+
+
+
+/* Purify functions
+ *
+ * N.B. There are some interfaces described in the purify.h file that are
+ * not described in the manual.
+ *
+ * Unsigned longs purify_report_{address,number,type,result} are not
+ * accessible from the Python layer since they seem mostly useful when
+ * purify_stop_here() is called by the (C) debugger.  The same is true of
+ * the purify_stop_here_internal() function so it isn't exported either.
+ * And purify_stop_here() should never be called directly.
+ *
+ * The header file says purify_{new,all,clear_new}_reports() are obsolete
+ * so they aren't exported.
+ *
+ * None of the custom dynamic loader functions are exported.
+ *
+ * purify_unsafe_memcpy() isn't exported.
+ *
+ * purify_{start,size}_of_block() aren't exported.
+ *
+ * The manual that I have says that the prototype for the second argument
+ * to purify_map_pool is:
+ *
+ *    void (*fn)(char*)
+ *
+ * but the purify.h file declares it as:
+ *
+ *    void (*fn)(char*, int, void*)
+ *
+ * and does not explain what the other arguments are for.  I support the
+ * latter but I don't know if I do it right or usefully.
+ *
+ * The header file says that purify_describe() returns a char* which is the
+ * pointer passed to it.  The manual says it returns an int, but I believe
+ * that is a typo.
+ */
+#ifdef PURIFY_H
+
+static PyObject*
+pure_purify_all_inuse(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(purify_all_inuse, self, args);
+}
+static PyObject*
+pure_purify_all_leaks(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(purify_all_leaks, self, args);
+}
+static PyObject*
+pure_purify_new_inuse(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(purify_new_inuse, self, args);
+}
+static PyObject*
+pure_purify_new_leaks(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(purify_new_leaks, self, args);
+}
+static PyObject*
+pure_purify_clear_inuse(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(purify_clear_inuse, self, args);
+}
+static PyObject*
+pure_purify_clear_leaks(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(purify_clear_leaks, self, args);
+}
+static PyObject*
+pure_purify_all_fds_inuse(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(purify_all_fds_inuse, self, args);
+}
+static PyObject*
+pure_purify_new_fds_inuse(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(purify_new_fds_inuse, self, args);
+}
+static PyObject*
+pure_purify_printf_with_call_chain(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_printfish_function(purify_printf_with_call_chain,
+				       self, args);
+}
+static PyObject*
+pure_purify_set_pool_id(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	long memrep;
+	int id;
+
+	if (!PyArg_ParseTuple(args, "li", &memrep, &id))
+		return NULL;
+
+	purify_set_pool_id((char*)memrep, id);
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+static PyObject*
+pure_purify_get_pool_id(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_intasaddr_function(purify_get_pool_id, self, args);
+}
+static PyObject*
+pure_purify_set_user_data(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	long memrep;
+	long datarep;
+
+	if (!PyArg_ParseTuple(args, "ll", &memrep, &datarep))
+		return NULL;
+
+	purify_set_user_data((char*)memrep, (void*)datarep);
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+static PyObject*
+pure_purify_get_user_data(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+        /* can't use call_intasaddr_function() since purify_get_user_data()
+         * returns a void*
+         */
+	long memrep;
+	void* data;
+
+	if (!PyArg_ParseTuple(args, "l", &memrep))
+		return NULL;
+
+	data = purify_get_user_data((char*)memrep);
+	return Py_BuildValue("l", (long)data);
+}
+
+
+/* this global variable is shared by both mapping functions:
+ * pure_purify_map_pool() and pure_purify_map_pool_id().  Since they cache
+ * this variable it should be safe in the face of recursion or cross
+ * calling.
+ *
+ * Further note that the prototype for the callback function is wrong in
+ * the Purify manual.  The manual says the function takes a single char*,
+ * but the header file says it takes an additional int and void*.  I have
+ * no idea what these are for!
+ */
+static PyObject* MapCallable = NULL;
+
+static void
+map_pool_callback(mem, user_size, user_aux_data)
+	char* mem;
+	int user_size;
+	void *user_aux_data;
+{
+	long memrep = (long)mem;
+	long user_aux_data_rep = (long)user_aux_data;
+	PyObject* result;
+	PyObject* memobj = Py_BuildValue("lil", memrep, user_size,
+					 user_aux_data_rep);
+
+	if (memobj == NULL)
+		return;
+
+	result = PyEval_CallObject(MapCallable, memobj);
+	Py_DECREF(result);
+	Py_DECREF(memobj);
+}
+
+static PyObject*
+pure_purify_map_pool(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+        /* cache global variable in case of recursion */
+	PyObject* saved_callable = MapCallable;
+	PyObject* arg_callable;
+	int id;
+
+	if (!PyArg_ParseTuple(args, "iO", &id, &arg_callable))
+		return NULL;
+
+	if (!PyCallable_Check(arg_callable)) {
+		PyErr_SetString(PyExc_TypeError,
+				"Second argument must be callable");
+		return NULL;
+	}
+	MapCallable = arg_callable;
+	purify_map_pool(id, map_pool_callback);
+	MapCallable = saved_callable;
+
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+static void
+PurifyMapPoolIdCallback(id)
+	int id;
+{
+	PyObject* result;
+	PyObject* intobj = Py_BuildValue("i", id);
+
+	if (intobj == NULL)
+		return;
+
+	result = PyEval_CallObject(MapCallable, intobj);
+	Py_DECREF(result);
+	Py_DECREF(intobj);
+}
+
+static PyObject*
+pure_purify_map_pool_id(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+        /* cache global variable in case of recursion */
+	PyObject* saved_callable = MapCallable;
+	PyObject* arg_callable;
+
+	if (!PyArg_ParseTuple(args, "O", &arg_callable))
+		return NULL;
+
+	if (!PyCallable_Check(arg_callable)) {
+		PyErr_SetString(PyExc_TypeError, "Argument must be callable.");
+		return NULL;
+	}
+
+	MapCallable = arg_callable;
+	purify_map_pool_id(PurifyMapPoolIdCallback);
+	MapCallable = saved_callable;
+
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+
+
+static PyObject*
+pure_purify_new_messages(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(purify_new_messages, self, args);
+}
+static PyObject*
+pure_purify_all_messages(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(purify_all_messages, self, args);
+}
+static PyObject*
+pure_purify_clear_messages(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(purify_clear_messages, self, args);
+}
+static PyObject*
+pure_purify_clear_new_messages(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(purify_clear_new_messages, self, args);
+}
+static PyObject*
+pure_purify_start_batch(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(purify_start_batch, self, args);
+}
+static PyObject*
+pure_purify_start_batch_show_first(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(purify_start_batch_show_first,
+				     self, args);
+}
+static PyObject*
+pure_purify_stop_batch(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(purify_stop_batch, self, args);
+}
+static PyObject*
+pure_purify_name_thread(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+        /* can't strictly use call_stringarg_function since
+         * purify_name_thread takes a const char*, not a char*
+         */
+	int status;
+	char* stringarg;
+
+	if (!PyArg_ParseTuple(args, "s", &stringarg))
+		return NULL;
+
+	status = purify_name_thread(stringarg);
+	return Py_BuildValue("i", status);
+}
+static PyObject*
+pure_purify_watch(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_intasaddr_function(purify_watch, self, args);
+}
+static PyObject*
+pure_purify_watch_1(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_intasaddr_function(purify_watch_1, self, args);
+}
+static PyObject*
+pure_purify_watch_2(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_intasaddr_function(purify_watch_2, self, args);
+}
+static PyObject*
+pure_purify_watch_4(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_intasaddr_function(purify_watch_4, self, args);
+}
+static PyObject*
+pure_purify_watch_8(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_intasaddr_function(purify_watch_8, self, args);
+}
+static PyObject*
+pure_purify_watch_w_1(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_intasaddr_function(purify_watch_w_1, self, args);
+}
+static PyObject*
+pure_purify_watch_w_2(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_intasaddr_function(purify_watch_w_2, self, args);
+}
+static PyObject*
+pure_purify_watch_w_4(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_intasaddr_function(purify_watch_w_4, self, args);
+}
+static PyObject*
+pure_purify_watch_w_8(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_intasaddr_function(purify_watch_w_8, self, args);
+}
+static PyObject*
+pure_purify_watch_r_1(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_intasaddr_function(purify_watch_r_1, self, args);
+}
+static PyObject*
+pure_purify_watch_r_2(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_intasaddr_function(purify_watch_r_2, self, args);
+}
+static PyObject*
+pure_purify_watch_r_4(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_intasaddr_function(purify_watch_r_4, self, args);
+}
+static PyObject*
+pure_purify_watch_r_8(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_intasaddr_function(purify_watch_r_8, self, args);
+}
+static PyObject*
+pure_purify_watch_rw_1(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_intasaddr_function(purify_watch_rw_1, self, args);
+}
+static PyObject*
+pure_purify_watch_rw_2(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_intasaddr_function(purify_watch_rw_2, self, args);
+}
+static PyObject*
+pure_purify_watch_rw_4(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_intasaddr_function(purify_watch_rw_4, self, args);
+}
+static PyObject*
+pure_purify_watch_rw_8(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_intasaddr_function(purify_watch_rw_8, self, args);
+}
+
+static PyObject*
+pure_purify_watch_n(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	long addrrep;
+	unsigned int size;
+	char* type;
+	int status;
+
+	if (!PyArg_ParseTuple(args, "lis", &addrrep, &size, &type))
+		return NULL;
+
+	status = purify_watch_n((char*)addrrep, size, type);
+	return Py_BuildValue("i", status);
+}
+
+static PyObject*
+pure_purify_watch_info(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(purify_watch_info, self, args);
+}
+
+static PyObject*
+pure_purify_watch_remove(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	int watchno;
+	int status;
+
+	if (!PyArg_ParseTuple(args, "i", &watchno))
+		return NULL;
+
+	status = purify_watch_remove(watchno);
+	return Py_BuildValue("i", status);
+}
+
+static PyObject*
+pure_purify_watch_remove_all(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(purify_watch_remove_all, self, args);
+}
+static PyObject*
+pure_purify_describe(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	long addrrep;
+	char* rtn;
+
+	if (!PyArg_ParseTuple(args, "l", &addrrep))
+		return NULL;
+
+	rtn = purify_describe((char*)addrrep);
+	return Py_BuildValue("l", (long)rtn);
+}
+
+static PyObject*
+pure_purify_what_colors(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	long addrrep;
+	unsigned int size;
+	int status;
+    
+	if (!PyArg_ParseTuple(args, "li", &addrrep, &size))
+		return NULL;
+
+	status = purify_what_colors((char*)addrrep, size);
+	return Py_BuildValue("i", status);
+}
+
+static PyObject*
+pure_purify_is_running(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(purify_is_running, self, args);
+}
+
+static PyObject*
+pure_purify_assert_is_readable(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_stringandint_function(purify_assert_is_readable,
+					  self, args);
+}
+static PyObject*
+pure_purify_assert_is_writable(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_stringandint_function(purify_assert_is_writable,
+					  self, args);
+}
+
+#if HAS_PURIFY_EXIT
+
+/* I wish I could include this, but I can't.  See the notes at the top of
+ * the file.
+ */
+
+static PyObject*
+pure_purify_exit(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	int status;
+
+	if (!PyArg_ParseTuple(args, "i", &status))
+		return NULL;
+
+        /* purify_exit doesn't always act like exit(). See the manual */
+	purify_exit(status);
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+#endif /* HAS_PURIFY_EXIT */
+
+#endif /* PURIFY_H */
+
+
+
+/* Quantify functions
+ *
+ * N.B. Some of these functions are only described in the quantify.h file,
+ * not in the version of the hardcopy manual that I had.  If you're not
+ * sure what some of these do, check the header file, it is documented
+ * fairly well.
+ *
+ * None of the custom dynamic loader functions are exported.
+ *
+ */
+#ifdef QUANTIFY_H
+
+static PyObject*
+pure_quantify_is_running(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(quantify_is_running, self, args);
+}
+static PyObject*
+pure_quantify_help(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(quantify_help, self, args);
+}
+static PyObject*
+pure_quantify_print_recording_state(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(quantify_print_recording_state,
+				     self, args);
+}
+static PyObject*
+pure_quantify_start_recording_data(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(quantify_start_recording_data,
+				     self, args);
+}
+static PyObject*
+pure_quantify_stop_recording_data(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(quantify_stop_recording_data, self, args);
+}
+static PyObject*
+pure_quantify_is_recording_data(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(quantify_is_recording_data, self, args);
+}
+static PyObject*
+pure_quantify_start_recording_system_calls(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(quantify_start_recording_system_calls,
+				     self, args);
+}
+static PyObject*
+pure_quantify_stop_recording_system_calls(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(quantify_stop_recording_system_calls,
+				     self, args);
+}
+static PyObject*
+pure_quantify_is_recording_system_calls(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(quantify_is_recording_system_calls,
+				     self, args);
+}
+static PyObject*
+pure_quantify_start_recording_system_call(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_stringorint_function(quantify_start_recording_system_call,
+					   self, args);
+}
+static PyObject*
+pure_quantify_stop_recording_system_call(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_stringorint_function(quantify_stop_recording_system_call,
+					 self, args);
+}
+static PyObject*
+pure_quantify_is_recording_system_call(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_stringorint_function(quantify_is_recording_system_call,
+					 self, args);
+}
+static PyObject*
+pure_quantify_start_recording_dynamic_library_data(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(
+		quantify_start_recording_dynamic_library_data,
+		self, args);
+}
+static PyObject*
+pure_quantify_stop_recording_dynamic_library_data(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(
+		quantify_stop_recording_dynamic_library_data,
+		self, args);
+}
+static PyObject*
+pure_quantify_is_recording_dynamic_library_data(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(
+		quantify_is_recording_dynamic_library_data,
+		self, args);
+}
+static PyObject*
+pure_quantify_start_recording_register_window_traps(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(
+		quantify_start_recording_register_window_traps,
+		self, args);
+}
+static PyObject*
+pure_quantify_stop_recording_register_window_traps(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(
+		quantify_stop_recording_register_window_traps,
+		self, args);
+}
+static PyObject*
+pure_quantify_is_recording_register_window_traps(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(
+		quantify_is_recording_register_window_traps,
+		self, args);
+}
+static PyObject*
+pure_quantify_disable_recording_data(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(quantify_disable_recording_data,
+				     self, args);
+}
+static PyObject*
+pure_quantify_clear_data(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(quantify_clear_data, self, args);
+}
+static PyObject*
+pure_quantify_save_data(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_voidarg_function(quantify_save_data, self, args);
+}
+static PyObject*
+pure_quantify_save_data_to_file(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_stringarg_function(quantify_save_data_to_file, self, args);
+}
+static PyObject*
+pure_quantify_add_annotation(self, args)
+	PyObject *self;
+	PyObject *args;
+{
+	return call_stringarg_function(quantify_add_annotation, self, args);
+}
+
+#endif /* QUANTIFY_H */
+
+
+
+/* external interface
+ */
+static struct PyMethodDef
+pure_methods[] = {
+#ifdef COMMON_PURE_FUNCTIONS
+    {"pure_logfile_printf",            pure_pure_logfile_printf,            1},
+    {"pure_printf",                    pure_pure_printf,                    1},
+    {"pure_printf_with_banner",        pure_pure_printf_with_banner,        1},
+#endif /* COMMON_PURE_FUNCTIONS */
+#ifdef PURIFY_H
+    {"purify_all_inuse",               pure_purify_all_inuse,               1},
+    {"purify_all_leaks",               pure_purify_all_leaks,               1},
+    {"purify_new_inuse",               pure_purify_new_inuse,               1},
+    {"purify_new_leaks",               pure_purify_new_leaks,               1},
+    {"purify_clear_inuse",             pure_purify_clear_inuse,             1},
+    {"purify_clear_leaks",             pure_purify_clear_leaks,             1},
+    {"purify_all_fds_inuse",           pure_purify_all_fds_inuse,           1},
+    {"purify_new_fds_inuse",           pure_purify_new_fds_inuse,           1},
+    /* see purify.h */
+    {"purify_logfile_printf",          pure_pure_logfile_printf,            1},
+    {"purify_printf",                  pure_pure_printf,                    1},
+    {"purify_printf_with_banner",      pure_pure_printf_with_banner,        1},
+    /**/
+    {"purify_printf_with_call_chain",  pure_purify_printf_with_call_chain,  1},
+    {"purify_set_pool_id",             pure_purify_set_pool_id,             1},
+    {"purify_get_pool_id",             pure_purify_get_pool_id,             1},
+    {"purify_set_user_data",           pure_purify_set_user_data,           1},
+    {"purify_get_user_data",           pure_purify_get_user_data,           1},
+    {"purify_map_pool",                pure_purify_map_pool,                1},
+    {"purify_map_pool_id",             pure_purify_map_pool_id,             1},
+    {"purify_new_messages",            pure_purify_new_messages,            1},
+    {"purify_all_messages",            pure_purify_all_messages,            1},
+    {"purify_clear_messages",          pure_purify_clear_messages,          1},
+    {"purify_clear_new_messages",      pure_purify_clear_new_messages,      1},
+    {"purify_start_batch",             pure_purify_start_batch,             1},
+    {"purify_start_batch_show_first",  pure_purify_start_batch_show_first,  1},
+    {"purify_stop_batch",              pure_purify_stop_batch,              1},
+    {"purify_name_thread",             pure_purify_name_thread,             1},
+    {"purify_watch",                   pure_purify_watch,                   1},
+    {"purify_watch_1",                 pure_purify_watch_1,                 1},
+    {"purify_watch_2",                 pure_purify_watch_2,                 1},
+    {"purify_watch_4",                 pure_purify_watch_4,                 1},
+    {"purify_watch_8",                 pure_purify_watch_8,                 1},
+    {"purify_watch_w_1",               pure_purify_watch_w_1,               1},
+    {"purify_watch_w_2",               pure_purify_watch_w_2,               1},
+    {"purify_watch_w_4",               pure_purify_watch_w_4,               1},
+    {"purify_watch_w_8",               pure_purify_watch_w_8,               1},
+    {"purify_watch_r_1",               pure_purify_watch_r_1,               1},
+    {"purify_watch_r_2",               pure_purify_watch_r_2,               1},
+    {"purify_watch_r_4",               pure_purify_watch_r_4,               1},
+    {"purify_watch_r_8",               pure_purify_watch_r_8,               1},
+    {"purify_watch_rw_1",              pure_purify_watch_rw_1,              1},
+    {"purify_watch_rw_2",              pure_purify_watch_rw_2,              1},
+    {"purify_watch_rw_4",              pure_purify_watch_rw_4,              1},
+    {"purify_watch_rw_8",              pure_purify_watch_rw_8,              1},
+    {"purify_watch_n",                 pure_purify_watch_n,                 1},
+    {"purify_watch_info",              pure_purify_watch_info,              1},
+    {"purify_watch_remove",            pure_purify_watch_remove,            1},
+    {"purify_watch_remove_all",        pure_purify_watch_remove_all,        1},
+    {"purify_describe",                pure_purify_describe,                1},
+    {"purify_what_colors",             pure_purify_what_colors,             1},
+    {"purify_is_running",              pure_purify_is_running,              1},
+    {"purify_assert_is_readable",      pure_purify_assert_is_readable,      1},
+    {"purify_assert_is_writable",      pure_purify_assert_is_writable,      1},
+#if HAS_PURIFY_EXIT
+    /* I wish I could include this, but I can't.  See the notes at the
+     * top of the file.
+     */
+    {"purify_exit",                    pure_purify_exit,                    1},
+#endif /* HAS_PURIFY_EXIT */
+#endif /* PURIFY_H */
+#ifdef QUANTIFY_H
+    {"quantify_is_running",            pure_quantify_is_running,            1},
+    {"quantify_help",                  pure_quantify_help,                  1},
+    {"quantify_print_recording_state", pure_quantify_print_recording_state, 1},
+    {"quantify_start_recording_data",  pure_quantify_start_recording_data,  1},
+    {"quantify_stop_recording_data",   pure_quantify_stop_recording_data,   1},
+    {"quantify_is_recording_data",     pure_quantify_is_recording_data,  1},
+    {"quantify_start_recording_system_calls",
+     pure_quantify_start_recording_system_calls, 1},
+    {"quantify_stop_recording_system_calls",
+     pure_quantify_stop_recording_system_calls, 1},
+    {"quantify_is_recording_system_calls",
+     pure_quantify_is_recording_system_calls, 1},
+    {"quantify_start_recording_system_call",
+     pure_quantify_start_recording_system_call, 1},
+    {"quantify_stop_recording_system_call",
+     pure_quantify_stop_recording_system_call, 1},
+    {"quantify_is_recording_system_call",
+     pure_quantify_is_recording_system_call, 1},
+    {"quantify_start_recording_dynamic_library_data",
+     pure_quantify_start_recording_dynamic_library_data, 1},
+    {"quantify_stop_recording_dynamic_library_data",
+     pure_quantify_stop_recording_dynamic_library_data, 1},
+    {"quantify_is_recording_dynamic_library_data",
+     pure_quantify_is_recording_dynamic_library_data, 1},
+    {"quantify_start_recording_register_window_traps",
+     pure_quantify_start_recording_register_window_traps, 1},
+    {"quantify_stop_recording_register_window_traps",
+     pure_quantify_stop_recording_register_window_traps, 1},
+    {"quantify_is_recording_register_window_traps",
+     pure_quantify_is_recording_register_window_traps, 1},
+    {"quantify_disable_recording_data",
+     pure_quantify_disable_recording_data, 1},
+    {"quantify_clear_data",        pure_quantify_clear_data,        1},
+    {"quantify_save_data",         pure_quantify_save_data,         1},
+    {"quantify_save_data_to_file", pure_quantify_save_data_to_file, 1},
+    {"quantify_add_annotation",    pure_quantify_add_annotation,    1},
+#endif /* QUANTIFY_H */
+    {NULL,  NULL}			     /* sentinel */
+};
+
+
+
+static void
+ins(d, name, val)
+	PyObject *d;
+	char* name;
+	long val;
+{
+	PyObject *v = PyInt_FromLong(val);
+	if (v) {
+		(void)PyDict_SetItemString(d, name, v);
+		Py_DECREF(v);
+	}
+}
+
+
+void
+initpure()
+{
+	PyObject *m, *d;
+
+	m = Py_InitModule("pure", pure_methods);
+	d = PyModule_GetDict(m);
+
+        /* this is bogus because we should be able to find this information
+         * out from the header files.  Pure's current versions don't
+         * include this information!
+         */
+#ifdef PURE_PURIFY_VERSION
+	ins(d, "PURIFY_VERSION", PURE_PURIFY_VERSION);
+#else
+	PyDict_SetItemString(d, "PURIFY_VERSION", Py_None);
+#endif
+
+        /* these aren't terribly useful because purify_exit() isn't
+         * exported correctly.  See the note at the top of the file.
+         */
+#ifdef PURIFY_EXIT_ERRORS
+	ins(d, "PURIFY_EXIT_ERRORS", PURIFY_EXIT_ERRORS);
+#endif
+#ifdef PURIFY_EXIT_LEAKS
+	ins(d, "PURIFY_EXIT_LEAKS",  PURIFY_EXIT_LEAKS);
+#endif
+#ifdef PURIFY_EXIT_PLEAKS
+	ins(d, "PURIFY_EXIT_PLEAKS", PURIFY_EXIT_PLEAKS);
+#endif
+
+
+#ifdef PURE_QUANTIFY_VERSION
+	ins(d, "QUANTIFY_VERSION", PURE_QUANTIFY_VERSION);
+#else
+	PyDict_SetItemString(d, "QUANTIFY_VERSION", Py_None);
+#endif
+	if (PyErr_Occurred())
+		Py_FatalError("couldn't initialize the pure module");
+}
diff --git a/Modules/syslogmodule.c b/Modules/syslogmodule.c
index db27101..daee15f 100644
--- a/Modules/syslogmodule.c
+++ b/Modules/syslogmodule.c
@@ -155,14 +155,17 @@ static PyMethodDef syslog_methods[] = {
 
 /* Initialization function for the module */
 
-void ins(d, s, x)
+static void
+ins(d, s, x)
 	PyObject *d;
 	char *s;
 	long x;
 {
-	PyObject *xl = PyInt_FromLong(x);
-	PyDict_SetItemString(d, s, xl);
-	Py_XDECREF(xl);
+	PyObject *v = PyInt_FromLong(x);
+	if (v) {
+		PyDict_SetItemString(d, s, v);
+		Py_DECREF(v);
+	}
 }