Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8d37132

Browse files
committed
Rename to vararg_format().
1 parent326d865 commit8d37132

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

‎src/backend/libpq/portalbuf.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.15 1999/06/1904:54:13 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.16 1999/06/1905:00:27 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -89,7 +89,7 @@ portals_realloc(size_t size)
8989
portals=newp;
9090
else
9191
libpq_raise(&PortalError,
92-
varargform("Cannot alloc more memory in portals_realloc"));
92+
vararg_format("Cannot alloc more memory in portals_realloc"));
9393

9494
for (i=oldsize;i<portals_array_size;i++)
9595
portals[i]= (PortalEntry*)NULL;
@@ -109,11 +109,11 @@ pbuf_alloc(size_t size)
109109
caddr_taddr;
110110

111111
if (size <=0)
112-
libpq_raise(&MemoryError,varargform("Invalid argument to pbuf_alloc()."));
112+
libpq_raise(&MemoryError,vararg_format("Invalid argument to pbuf_alloc()."));
113113

114114
addr= (caddr_t)palloc(size);
115115
if (addr== (caddr_t)NULL)
116-
libpq_raise(&MemoryError,varargform("Cannot Allocate space."));
116+
libpq_raise(&MemoryError,vararg_format("Cannot Allocate space."));
117117

118118
returnaddr;
119119
}
@@ -131,7 +131,7 @@ pbuf_free(caddr_t pointer)
131131
if (pointer)
132132
pfree(pointer);
133133
else
134-
libpq_raise(&MemoryError,varargform("Tried to free NULL memory pointer"));
134+
libpq_raise(&MemoryError,vararg_format("Tried to free NULL memory pointer"));
135135

136136
}
137137

@@ -437,7 +437,7 @@ pbuf_close(char *pname)
437437
inti;
438438

439439
if ((i=pbuf_getIndex(pname))==-1)
440-
libpq_raise(&PortalError,varargform("Portal %s does not exist.",pname));
440+
libpq_raise(&PortalError,vararg_format("Portal %s does not exist.",pname));
441441

442442
pbuf_freePortal(portals[i]->portal);
443443
pbuf_freeEntry(i);
@@ -462,7 +462,7 @@ pbuf_findGroup(PortalBuffer *portal,
462462

463463
if (group==NULL)
464464
libpq_raise(&PortalError,
465-
varargform("Group index %d out of bound.",group_index));
465+
vararg_format("Group index %d out of bound.",group_index));
466466

467467
returngroup;
468468
}
@@ -485,7 +485,7 @@ pbuf_findFnumber(GroupBuffer *group,
485485
returni;
486486

487487
libpq_raise(&PortalError,
488-
varargform("Field-name %s does not exist.",field_name));
488+
vararg_format("Field-name %s does not exist.",field_name));
489489

490490
/* not reached, here to make compiler happy */
491491
return0;
@@ -502,7 +502,7 @@ pbuf_checkFnumber(GroupBuffer *group,
502502
{
503503
if (field_number<0||field_number >=group->no_fields)
504504
libpq_raise(&PortalError,
505-
varargform("Field number %d out of bound.",field_number));
505+
vararg_format("Field number %d out of bound.",field_number));
506506
}
507507

508508
/* --------------------------------

‎src/backend/utils/error/format.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.12 1999/06/1904:54:19 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.13 1999/06/1905:00:28 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -22,11 +22,11 @@ static char FormBuf[FormMaxSize];
2222

2323

2424
/* ----------------
25-
*varargform
25+
*vararg_format
2626
* ----------------
2727
*/
2828
char*
29-
varargform(constchar*fmt,...)
29+
vararg_format(constchar*fmt,...)
3030
{
3131
va_listargs;
3232

‎src/backend/utils/mmgr/portalmem.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.22 1999/06/1904:54:19 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.23 1999/06/1905:00:29 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -234,7 +234,7 @@ PortalVariableMemoryRealloc(PortalVariableMemory this,
234234
staticchar*
235235
PortalVariableMemoryGetName(PortalVariableMemorythis)
236236
{
237-
returnvarargform("%s-var",PortalVariableMemoryGetPortal(this)->name);
237+
returnvararg_format("%s-var",PortalVariableMemoryGetPortal(this)->name);
238238
}
239239

240240
/* ----------------
@@ -312,7 +312,7 @@ PortalHeapMemoryRealloc(PortalHeapMemory this,
312312
staticchar*
313313
PortalHeapMemoryGetName(PortalHeapMemorythis)
314314
{
315-
returnvarargform("%s-heap",PortalHeapMemoryGetPortal(this)->name);
315+
returnvararg_format("%s-heap",PortalHeapMemoryGetPortal(this)->name);
316316
}
317317

318318
/* ----------------

‎src/include/c.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: c.h,v 1.56 1999/06/1904:54:23 momjian Exp $
10+
* $Id: c.h,v 1.57 1999/06/1905:00:30 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -591,7 +591,7 @@ extern intassert_enabled;
591591
#defineLogTrap(condition,exception,printArgs) \
592592
{ if ((assert_enabled) && (condition)) \
593593
ExceptionalCondition(CppAsString(condition), &(exception), \
594-
varargform printArgs, __FILE__, __LINE__); }
594+
vararg_format printArgs, __FILE__, __LINE__); }
595595

596596
/*
597597
*LogTrapMacro is the same as LogTrap but it's intended for use in macros:
@@ -602,7 +602,7 @@ extern intassert_enabled;
602602
((bool) ((! assert_enabled) || (! condition) || \
603603
(ExceptionalCondition(CppAsString(condition), \
604604
&(exception), \
605-
varargform printArgs, __FILE__, __LINE__))))
605+
vararg_format printArgs, __FILE__, __LINE__))))
606606

607607
#ifndefUSE_ASSERT_CHECKING
608608
#defineLogAssert(condition,printArgs)
@@ -711,10 +711,10 @@ extern int ExceptionalCondition(char *conditionName,
711711

712712

713713
/* ----------------
714-
*varargform is used by assert and the exception handling stuff
714+
*vararg_format is used by assert and the exception handling stuff
715715
* ----------------
716716
*/
717-
externchar*varargform(constchar*fmt,...);
717+
externchar*vararg_format(constchar*fmt,...);
718718

719719

720720

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp