Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
8d37132e
G
Gpdb
项目概览
Greenplum
/
Gpdb
通知
7
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gpdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8d37132e
编写于
6月 19, 1999
作者:
B
Bruce Momjian
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename to vararg_format().
上级
326d8658
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
20 deletion
+20
-20
src/backend/libpq/portalbuf.c
src/backend/libpq/portalbuf.c
+9
-9
src/backend/utils/error/format.c
src/backend/utils/error/format.c
+3
-3
src/backend/utils/mmgr/portalmem.c
src/backend/utils/mmgr/portalmem.c
+3
-3
src/include/c.h
src/include/c.h
+5
-5
未找到文件。
src/backend/libpq/portalbuf.c
浏览文件 @
8d37132e
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.1
5 1999/06/19 04:54:13
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.1
6 1999/06/19 05:00:27
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -89,7 +89,7 @@ portals_realloc(size_t size)
portals
=
newp
;
else
libpq_raise
(
&
PortalError
,
vararg
form
(
"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
,
vararg
form
(
"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
,
vararg
form
(
"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
,
vararg
form
(
"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
,
vararg
form
(
"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
,
vararg
form
(
"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
,
vararg
form
(
"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
,
vararg
form
(
"Field number %d out of bound."
,
field_number
));
vararg
_format
(
"Field number %d out of bound."
,
field_number
));
}
/* --------------------------------
...
...
src/backend/utils/error/format.c
浏览文件 @
8d37132e
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.1
2 1999/06/19 04:54:19
momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.1
3 1999/06/19 05:00:28
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -22,11 +22,11 @@ static char FormBuf[FormMaxSize];
/* ----------------
* vararg
form
* vararg
_format
* ----------------
*/
char
*
vararg
form
(
const
char
*
fmt
,...)
vararg
_format
(
const
char
*
fmt
,...)
{
va_list
args
;
...
...
src/backend/utils/mmgr/portalmem.c
浏览文件 @
8d37132e
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.2
2 1999/06/19 04:54:1
9 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.2
3 1999/06/19 05:00:2
9 momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -234,7 +234,7 @@ PortalVariableMemoryRealloc(PortalVariableMemory this,
static
char
*
PortalVariableMemoryGetName
(
PortalVariableMemory
this
)
{
return
vararg
form
(
"%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
vararg
form
(
"%s-heap"
,
PortalHeapMemoryGetPortal
(
this
)
->
name
);
return
vararg
_format
(
"%s-heap"
,
PortalHeapMemoryGetPortal
(
this
)
->
name
);
}
/* ----------------
...
...
src/include/c.h
浏览文件 @
8d37132e
...
...
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: c.h,v 1.5
6 1999/06/19 04:54:23
momjian Exp $
* $Id: c.h,v 1.5
7 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), \
vararg
form
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), \
vararg
form
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,
/* ----------------
* vararg
form
is used by assert and the exception handling stuff
* vararg
_format
is used by assert and the exception handling stuff
* ----------------
*/
extern
char
*
vararg
form
(
const
char
*
fmt
,...);
extern
char
*
vararg
_format
(
const
char
*
fmt
,...);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录