From 73bf5369b8b9043f0e0d215f2aca42ae0bfe43a9 Mon Sep 17 00:00:00 2001 From: Herb Lewis Date: Tue, 3 Dec 2002 21:49:00 +0000 Subject: use FILE_MACRO instead of __FILE__ use FUNCTION_MACRO instead of __FUNCTION_ (This used to be commit 243763d6eb107ab2444d81025232c8fe795baaf1) --- source3/python/py_tdbpack.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source3/python/py_tdbpack.c') diff --git a/source3/python/py_tdbpack.c b/source3/python/py_tdbpack.c index d70937e8e0..8e294c7637 100644 --- a/source3/python/py_tdbpack.c +++ b/source3/python/py_tdbpack.c @@ -247,7 +247,7 @@ pytdbpack_data(const char *format_str, default: PyErr_Format(PyExc_ValueError, "%s: format character '%c' is not supported", - __FUNCTION__, ch); + FUNCTION_MACRO, ch); return NULL; } } @@ -477,7 +477,7 @@ pytdbunpack(PyObject *self, if (i == 0) { PyErr_Format(PyExc_ValueError, "%s: '$' may not be first character in format", - __FUNCTION__); + FUNCTION_MACRO); return NULL; } while (packed_len > 0) @@ -511,7 +511,7 @@ static void pytdbunpack_err_too_short(void) { PyErr_Format(PyExc_IndexError, - __FUNCTION__ ": data too short for unpack format"); + FUNCTION_MACRO ": data too short for unpack format"); } @@ -598,7 +598,7 @@ pytdbunpack_buffer(char **pbuf, int *plen, PyObject *val_list) if (slen < 0) { /* surely you jest */ PyErr_Format(PyExc_ValueError, - __FUNCTION__ ": buffer seems to have negative length"); + FUNCTION_MACRO ": buffer seems to have negative length"); return NULL; } @@ -608,7 +608,7 @@ pytdbunpack_buffer(char **pbuf, int *plen, PyObject *val_list) if (*plen < slen) { PyErr_Format(PyExc_IndexError, - __FUNCTION__ ": not enough data to unpack buffer: " + FUNCTION_MACRO ": not enough data to unpack buffer: " "need %d bytes, have %d", (int) slen, *plen); return NULL; @@ -668,7 +668,7 @@ static PyObject *pytdbunpack_item(char ch, } else { PyErr_Format(PyExc_ValueError, - __FUNCTION__ ": format character '%c' is not supported", + FUNCTION_MACRO ": format character '%c' is not supported", ch); return NULL; -- cgit