diff --git a/src/backend/libpq/portalbuf.c b/src/backend/libpq/portalbuf.c
index 21cc62bcceb6405bfd770a72c3d8df418be82149..19e4b2dc637bae89e26b3a791fb98031f7cfaaf7 100644
--- a/src/backend/libpq/portalbuf.c
+++ b/src/backend/libpq/portalbuf.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.15 1999/06/19 04:54:13 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.16 1999/06/19 05:00:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -89,7 +89,7 @@ portals_realloc(size_t size)
portals = newp;
else
libpq_raise(&PortalError,
- varargform("Cannot alloc more memory in portals_realloc"));
+ vararg_format("Cannot alloc more memory in portals_realloc"));
for (i = oldsize; i < portals_array_size; i++)
portals[i] = (PortalEntry *) NULL;
@@ -109,11 +109,11 @@ pbuf_alloc(size_t size)
caddr_t addr;
if (size <= 0)
- libpq_raise(&MemoryError, varargform("Invalid argument to pbuf_alloc()."));
+ libpq_raise(&MemoryError, vararg_format("Invalid argument to pbuf_alloc()."));
addr = (caddr_t) palloc(size);
if (addr == (caddr_t) NULL)
- libpq_raise(&MemoryError, varargform("Cannot Allocate space."));
+ libpq_raise(&MemoryError, vararg_format("Cannot Allocate space."));
return addr;
}
@@ -131,7 +131,7 @@ pbuf_free(caddr_t pointer)
if (pointer)
pfree(pointer);
else
- libpq_raise(&MemoryError, varargform("Tried to free NULL memory pointer"));
+ libpq_raise(&MemoryError, vararg_format("Tried to free NULL memory pointer"));
}
@@ -437,7 +437,7 @@ pbuf_close(char *pname)
int i;
if ((i = pbuf_getIndex(pname)) == -1)
- libpq_raise(&PortalError, varargform("Portal %s does not exist.", pname));
+ libpq_raise(&PortalError, vararg_format("Portal %s does not exist.", pname));
pbuf_freePortal(portals[i]->portal);
pbuf_freeEntry(i);
@@ -462,7 +462,7 @@ pbuf_findGroup(PortalBuffer *portal,
if (group == NULL)
libpq_raise(&PortalError,
- varargform("Group index %d out of bound.", group_index));
+ vararg_format("Group index %d out of bound.", group_index));
return group;
}
@@ -485,7 +485,7 @@ pbuf_findFnumber(GroupBuffer *group,
return i;
libpq_raise(&PortalError,
- varargform("Field-name %s does not exist.", field_name));
+ vararg_format("Field-name %s does not exist.", field_name));
/* not reached, here to make compiler happy */
return 0;
@@ -502,7 +502,7 @@ pbuf_checkFnumber(GroupBuffer *group,
{
if (field_number < 0 || field_number >= group->no_fields)
libpq_raise(&PortalError,
- varargform("Field number %d out of bound.", field_number));
+ vararg_format("Field number %d out of bound.", field_number));
}
/* --------------------------------
diff --git a/src/backend/utils/error/format.c b/src/backend/utils/error/format.c
index 7cf8f3b030e6a4206e0c1b4418ad38e8ff918d37..0f64a0c9098ad6b3f3f79d172034ebce621666c3 100644
--- a/src/backend/utils/error/format.c
+++ b/src/backend/utils/error/format.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.12 1999/06/19 04:54:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.13 1999/06/19 05:00:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,11 +22,11 @@ static char FormBuf[FormMaxSize];
/* ----------------
- * varargform
+ * vararg_format
* ----------------
*/
char *
-varargform(const char *fmt,...)
+vararg_format(const char *fmt,...)
{
va_list args;
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index 84818e8b35ef032816346f23b5c2442304256cec..2c800e033c6ca94e213ca690bcc2b19a7129e46e 100644
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.22 1999/06/19 04:54:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.23 1999/06/19 05:00:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -234,7 +234,7 @@ PortalVariableMemoryRealloc(PortalVariableMemory this,
static char *
PortalVariableMemoryGetName(PortalVariableMemory this)
{
- return varargform("%s-var", PortalVariableMemoryGetPortal(this)->name);
+ return vararg_format("%s-var", PortalVariableMemoryGetPortal(this)->name);
}
/* ----------------
@@ -312,7 +312,7 @@ PortalHeapMemoryRealloc(PortalHeapMemory this,
static char *
PortalHeapMemoryGetName(PortalHeapMemory this)
{
- return varargform("%s-heap", PortalHeapMemoryGetPortal(this)->name);
+ return vararg_format("%s-heap", PortalHeapMemoryGetPortal(this)->name);
}
/* ----------------
diff --git a/src/include/c.h b/src/include/c.h
index 175683a500811cb4570cd50cbb27404b32a610dd..48820e4f8e0c41f2207e87871b002a7ce74b8fd5 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: c.h,v 1.56 1999/06/19 04:54:23 momjian Exp $
+ * $Id: c.h,v 1.57 1999/06/19 05:00:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -591,7 +591,7 @@ extern int assert_enabled;
#define LogTrap(condition, exception, printArgs) \
{ if ((assert_enabled) && (condition)) \
ExceptionalCondition(CppAsString(condition), &(exception), \
- varargform printArgs, __FILE__, __LINE__); }
+ vararg_format printArgs, __FILE__, __LINE__); }
/*
* LogTrapMacro is the same as LogTrap but it's intended for use in macros:
@@ -602,7 +602,7 @@ extern int assert_enabled;
((bool) ((! assert_enabled) || (! condition) || \
(ExceptionalCondition(CppAsString(condition), \
&(exception), \
- varargform printArgs, __FILE__, __LINE__))))
+ vararg_format printArgs, __FILE__, __LINE__))))
#ifndef USE_ASSERT_CHECKING
#define LogAssert(condition, printArgs)
@@ -711,10 +711,10 @@ extern int ExceptionalCondition(char *conditionName,
/* ----------------
- * varargform is used by assert and the exception handling stuff
+ * vararg_format is used by assert and the exception handling stuff
* ----------------
*/
-extern char *varargform(const char *fmt,...);
+extern char *vararg_format(const char *fmt,...);