Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
f74036cd
提交
f74036cd
authored
8月 09, 2019
作者:
Andrey Volk
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-11989: [Core] Fix database module interface not returning statuses of some operations.
上级
b8ad860a
显示空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
17 行增加
和
20 行删除
+17
-20
switch_core_sqldb.c
src/switch_core_sqldb.c
+17
-20
没有找到文件。
src/switch_core_sqldb.c
浏览文件 @
f74036cd
...
...
@@ -818,6 +818,7 @@ SWITCH_DECLARE(int) switch_cache_db_affected_rows(switch_cache_db_handle_t *dbh)
switch_database_interface_t
*
database_interface
=
dbh
->
native_handle
.
database_interface_dbh
->
connection_options
.
database_interface
;
int
affected_rows
=
0
;
database_interface
->
affected_rows
(
dbh
->
native_handle
.
database_interface_dbh
,
&
affected_rows
);
return
affected_rows
;
}
break
;
}
...
...
@@ -1188,11 +1189,10 @@ SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql_event_callback(switc
case
SCDB_TYPE_DATABASE_INTERFACE
:
{
switch_database_interface_t
*
database_interface
=
dbh
->
native_handle
.
database_interface_dbh
->
connection_options
.
database_interface
;
switch_status_t
result
;
if
((
result
=
database_interface_handle_callback_exec
(
database_interface
,
dbh
->
native_handle
.
database_interface_dbh
,
sql
,
helper_callback
,
&
h
,
err
))
!=
SWITCH_STATUS_SUCCESS
)
{
if
((
status
=
database_interface_handle_callback_exec
(
database_interface
,
dbh
->
native_handle
.
database_interface_dbh
,
sql
,
helper_callback
,
&
h
,
err
))
!=
SWITCH_STATUS_SUCCESS
)
{
char
tmp
[
100
];
switch_snprintfv
(
tmp
,
sizeof
(
tmp
),
"%q-%i"
,
"Unable to execute_sql_event_callback"
,
result
);
switch_snprintfv
(
tmp
,
sizeof
(
tmp
),
"%q-%i"
,
"Unable to execute_sql_event_callback"
,
status
);
}
}
break
;
...
...
@@ -1249,17 +1249,16 @@ SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql_event_callback_err(s
case
SCDB_TYPE_DATABASE_INTERFACE
:
{
switch_database_interface_t
*
database_interface
=
dbh
->
native_handle
.
database_interface_dbh
->
connection_options
.
database_interface
;
switch_status_t
result
;
if
((
result
=
database_interface_handle_callback_exec
(
database_interface
,
dbh
->
native_handle
.
database_interface_dbh
,
sql
,
helper_callback
,
&
h
,
err
))
!=
SWITCH_STATUS_SUCCESS
)
{
if
((
status
=
database_interface_handle_callback_exec
(
database_interface
,
dbh
->
native_handle
.
database_interface_dbh
,
sql
,
helper_callback
,
&
h
,
err
))
!=
SWITCH_STATUS_SUCCESS
)
{
char
tmp
[
100
];
switch_snprintfv
(
tmp
,
sizeof
(
tmp
),
"%q-%i"
,
"Unable to execute_sql_event_callback_err"
,
result
);
}
else
{
switch_snprintfv
(
tmp
,
sizeof
(
tmp
),
"%q-%i"
,
"Unable to execute_sql_event_callback_err"
,
status
);
}
if
(
err
&&
*
err
)
{
(
*
err_callback
)(
pdata
,
(
const
char
*
)
*
err
);
}
}
}
break
;
case
SCDB_TYPE_ODBC
:
{
...
...
@@ -1316,11 +1315,10 @@ SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql_callback(switch_cach
case
SCDB_TYPE_DATABASE_INTERFACE
:
{
switch_database_interface_t
*
database_interface
=
dbh
->
native_handle
.
database_interface_dbh
->
connection_options
.
database_interface
;
switch_status_t
result
;
if
((
result
=
database_interface_handle_callback_exec
(
database_interface
,
dbh
->
native_handle
.
database_interface_dbh
,
sql
,
callback
,
pdata
,
err
))
!=
SWITCH_STATUS_SUCCESS
)
{
if
((
status
=
database_interface_handle_callback_exec
(
database_interface
,
dbh
->
native_handle
.
database_interface_dbh
,
sql
,
callback
,
pdata
,
err
))
!=
SWITCH_STATUS_SUCCESS
)
{
char
tmp
[
100
];
switch_snprintfv
(
tmp
,
sizeof
(
tmp
),
"%q-%i"
,
"Unable to execute_sql_callback"
,
result
);
switch_snprintfv
(
tmp
,
sizeof
(
tmp
),
"%q-%i"
,
"Unable to execute_sql_callback"
,
status
);
}
}
break
;
...
...
@@ -1372,17 +1370,16 @@ SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql_callback_err(switch_
case
SCDB_TYPE_DATABASE_INTERFACE
:
{
switch_database_interface_t
*
database_interface
=
dbh
->
native_handle
.
database_interface_dbh
->
connection_options
.
database_interface
;
switch_status_t
result
;
if
((
result
=
database_interface_handle_callback_exec
(
database_interface
,
dbh
->
native_handle
.
database_interface_dbh
,
sql
,
callback
,
pdata
,
err
))
!=
SWITCH_STATUS_SUCCESS
)
{
if
((
status
=
database_interface_handle_callback_exec
(
database_interface
,
dbh
->
native_handle
.
database_interface_dbh
,
sql
,
callback
,
pdata
,
err
))
!=
SWITCH_STATUS_SUCCESS
)
{
char
tmp
[
100
];
switch_snprintfv
(
tmp
,
sizeof
(
tmp
),
"%q-%i"
,
"Unable to execute_sql_callback_err"
,
result
);
}
else
{
switch_snprintfv
(
tmp
,
sizeof
(
tmp
),
"%q-%i"
,
"Unable to execute_sql_callback_err"
,
status
);
}
if
(
err
&&
*
err
)
{
(
*
err_callback
)(
pdata
,
(
const
char
*
)
*
err
);
}
}
}
break
;
case
SCDB_TYPE_ODBC
:
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论