From 8623ca6f82df2738f043bb4f344b050cd10281ed Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Wed, 4 Dec 2002 23:31:47 +0000 Subject: FUNCTION_MACRO change broke the Python modules. Also fix up string pasting (I thought this should only be a warning?) (This used to be commit 739285ff694e9ffd317ad47aec373e2007c20f45) --- source3/python/py_tdbpack.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'source3/python/py_tdbpack.c') diff --git a/source3/python/py_tdbpack.c b/source3/python/py_tdbpack.c index 8e294c7637..6d23dd840a 100644 --- a/source3/python/py_tdbpack.c +++ b/source3/python/py_tdbpack.c @@ -23,9 +23,18 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "Python.h" +/* This module is supposed to be standalone, however for portability + it would be good to use the FUNCTION_MACRO preprocessor define. */ -#include "Python.h" +#include "config.h" + +#ifdef HAVE_FUNCTION_MACRO +#define FUNCTION_MACRO (__FUNCTION__) +#else +#define FUNCTION_MACRO (__FILE__) +#endif static PyObject * pytdbpack_number(char ch, PyObject *val_iter, PyObject *packed_list); static PyObject * pytdbpack_str(char ch, @@ -511,7 +520,7 @@ static void pytdbunpack_err_too_short(void) { PyErr_Format(PyExc_IndexError, - FUNCTION_MACRO ": data too short for unpack format"); + "%s: data too short for unpack format", FUNCTION_MACRO); } @@ -598,7 +607,7 @@ pytdbunpack_buffer(char **pbuf, int *plen, PyObject *val_list) if (slen < 0) { /* surely you jest */ PyErr_Format(PyExc_ValueError, - FUNCTION_MACRO ": buffer seems to have negative length"); + "%s: buffer seems to have negative length", FUNCTION_MACRO); return NULL; } @@ -608,8 +617,8 @@ pytdbunpack_buffer(char **pbuf, int *plen, PyObject *val_list) if (*plen < slen) { PyErr_Format(PyExc_IndexError, - FUNCTION_MACRO ": not enough data to unpack buffer: " - "need %d bytes, have %d", + "%s: not enough data to unpack buffer: " + "need %d bytes, have %d", FUNCTION_MACRO, (int) slen, *plen); return NULL; } @@ -668,8 +677,8 @@ static PyObject *pytdbunpack_item(char ch, } else { PyErr_Format(PyExc_ValueError, - FUNCTION_MACRO ": format character '%c' is not supported", - ch); + "%s: format character '%c' is not supported", + FUNCTION_MACRO, ch); return NULL; } -- cgit