提交 2af53f5a authored 作者: Brian West's avatar Brian West

Merge pull request #1080 in FS/freeswitch from ~MOCHOUINARD/freeswitch:FS-9788 to master

* commit '347c93f1':
  FS-9788: Add close() option to FileIO implementation
...@@ -67,6 +67,7 @@ public: ...@@ -67,6 +67,7 @@ public:
JS_FILEIO_FUNCTION_DEF(Read); JS_FILEIO_FUNCTION_DEF(Read);
JS_FILEIO_FUNCTION_DEF(Write); JS_FILEIO_FUNCTION_DEF(Write);
JS_FILEIO_FUNCTION_DEF(GetData); JS_FILEIO_FUNCTION_DEF(GetData);
JS_FILEIO_FUNCTION_DEF(Close);
JS_FILEIO_GET_PROPERTY_DEF(GetProperty); JS_FILEIO_GET_PROPERTY_DEF(GetProperty);
}; };
......
...@@ -42,9 +42,17 @@ FSFileIO::~FSFileIO(void) ...@@ -42,9 +42,17 @@ FSFileIO::~FSFileIO(void)
if (_fd) { if (_fd) {
switch_file_close(_fd); switch_file_close(_fd);
} }
switch_core_destroy_memory_pool(&_pool); switch_core_destroy_memory_pool(&_pool);
} }
JS_FILEIO_FUNCTION_IMPL(Close)
{
if (_fd) {
switch_file_close(_fd);
_fd = NULL;
}
}
string FSFileIO::GetJSClassName() string FSFileIO::GetJSClassName()
{ {
return js_class_name; return js_class_name;
...@@ -213,6 +221,7 @@ static const js_function_t fileio_proc[] = { ...@@ -213,6 +221,7 @@ static const js_function_t fileio_proc[] = {
{"read", FSFileIO::Read}, {"read", FSFileIO::Read},
{"write", FSFileIO::Write}, {"write", FSFileIO::Write},
{"data", FSFileIO::GetData}, {"data", FSFileIO::GetData},
{"close", FSFileIO::Close},
{0} {0}
}; };
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论