From 73475f224597571b7ea8077fc8fbf67a4fd5b728 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Tue, 17 May 2016 22:30:01 +0300
Subject: [PATCH] phia: remove se_close() (it's not used anymore)
---
src/box/phia.c | 20 --------------------
src/box/phia.h | 1 -
2 files changed, 21 deletions(-)
diff --git a/src/box/phia.c b/src/box/phia.c
index eef8a0837b..eb0db26532 100644
--- a/src/box/phia.c
+++ b/src/box/phia.c
@@ -14309,16 +14309,9 @@ se_destroy(struct so *o)
return rcret;
}
-static int
-se_close(struct so *o)
-{
- return se_destroy(o);
-}
-
static struct soif seif =
{
.open = se_open,
- .close = se_close,
.destroy = se_destroy,
.setstring = se_confset_string,
.setint = se_confset_int,
@@ -15159,7 +15152,6 @@ static void *se_confkv_getstring(struct so *o, const char *path, int *size)
static struct soif seconfkvif =
{
.open = NULL,
- .close = NULL,
.destroy = se_confkv_destroy,
.setstring = NULL,
.setint = NULL,
@@ -15242,7 +15234,6 @@ se_confcursor_get(struct so *o, struct so *v)
static struct soif seconfcursorif =
{
.open = NULL,
- .close = NULL,
.destroy = se_confcursor_destroy,
.setstring = NULL,
.setint = NULL,
@@ -16140,7 +16131,6 @@ phia_document_getint(struct so *o, const char *path)
static struct soif sedocumentif =
{
.open = phia_document_open,
- .close = NULL,
.destroy = phia_document_destroy,
.setstring = phia_document_setstring,
.setint = phia_document_setint,
@@ -16519,16 +16509,6 @@ int phia_open(void *ptr)
return o->i->open(o);
}
-int phia_close(void *ptr)
-{
- struct so *o = sp_cast(ptr, __func__);
- if (unlikely(o->i->close == NULL)) {
- sp_unsupported(o, __func__);
- return -1;
- }
- return o->i->close(o);
-}
-
int phia_destroy(void *ptr)
{
struct so *o = sp_cast(ptr, __func__);
diff --git a/src/box/phia.h b/src/box/phia.h
index 681fc14854..3428048534 100644
--- a/src/box/phia.h
+++ b/src/box/phia.h
@@ -75,7 +75,6 @@ void *phia_getobject(void*, const char*);
void *phia_getstring(void*, const char*, int*);
int64_t phia_getint(void*, const char*);
int phia_open(void*);
-int phia_close(void*);
int phia_drop(void*);
int phia_destroy(void*);
struct phia_service *
--
GitLab