From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp54.i.mail.ru (smtp54.i.mail.ru [217.69.128.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 311CB4696C3 for ; Tue, 14 Apr 2020 04:27:28 +0300 (MSK) Received: by smtp54.i.mail.ru with esmtpa (envelope-from ) id 1jOAMJ-0007lM-NW for tarantool-patches@dev.tarantool.org; Tue, 14 Apr 2020 04:27:28 +0300 From: Vladislav Shpilevoy References: Message-ID: <3a282ad3-76ca-3443-9e72-9deb8206bbfe@tarantool.org> Date: Tue, 14 Apr 2020 03:27:26 +0200 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: [Tarantool-patches] [PATCH 44/43] build: export src/box/lua/console.c symbols List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Exports functions used by src/box/lua/console.lua via FFI. Closes #2971 --- I rebased the patchset on the master and got a new commit, since a couple of new functions were exported from the console module. extra/exports | 6 ------ src/box/lua/console.c | 10 ++++++++++ src/box/lua/init.c | 4 ++++ 3 files changed, 14 insertions(+), 6 deletions(-) delete mode 100644 extra/exports diff --git a/extra/exports b/extra/exports deleted file mode 100644 index 41432a547..000000000 --- a/extra/exports +++ /dev/null @@ -1,6 +0,0 @@ -# Symbols exported by the main Tarantool executable - -# FFI - -console_get_output_format -console_set_output_format diff --git a/src/box/lua/console.c b/src/box/lua/console.c index bd454c269..b2a6e87b7 100644 --- a/src/box/lua/console.c +++ b/src/box/lua/console.c @@ -803,3 +803,13 @@ error: lua_settop(L, savetop); return ml.list; } + +void ** +box_lua_console_export_syms(void) +{ + static void *syms[] = { + console_get_output_format, + console_set_output_format, + }; + return syms; +} diff --git a/src/box/lua/init.c b/src/box/lua/init.c index fb35ea56c..b565d6bc0 100644 --- a/src/box/lua/init.c +++ b/src/box/lua/init.c @@ -442,6 +442,9 @@ box_lua_init(struct lua_State *L) assert(lua_gettop(L) == 0); } +void ** +box_lua_console_export_syms(void); + void ** box_lua_tuple_export_syms(void); @@ -449,6 +452,7 @@ void ** box_lua_export_syms(void) { static void *syms[] = { + (void *)box_lua_console_export_syms, (void *)box_lua_tuple_export_syms, }; return syms; -- 2.21.1 (Apple Git-122.3)