From f55f089443268b7186cf1c75e4128ff0dc0916ec Mon Sep 17 00:00:00 2001 From: eric Date: Fri, 28 Dec 2018 11:13:58 +0000 Subject: [PATCH] remove unused members in struct table --- usr.sbin/smtpd/smtpd.h | 5 +---- usr.sbin/smtpd/table.c | 8 +------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index 36a8d9fb015..da9fbb4ad59 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.612 2018/12/27 15:41:50 gilles Exp $ */ +/* $OpenBSD: smtpd.h,v 1.613 2018/12/28 11:13:58 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade @@ -354,11 +354,8 @@ struct table { enum table_type t_type; char t_config[PATH_MAX]; - struct dict t_dict; - void *t_handle; struct table_backend *t_backend; - void *t_iter; }; struct table_backend { diff --git a/usr.sbin/smtpd/table.c b/usr.sbin/smtpd/table.c index 397d850ee9a..5c67d5f2cef 100644 --- a/usr.sbin/smtpd/table.c +++ b/usr.sbin/smtpd/table.c @@ -1,4 +1,4 @@ -/* $OpenBSD: table.c,v 1.43 2018/12/27 15:04:59 eric Exp $ */ +/* $OpenBSD: table.c,v 1.44 2018/12/28 11:13:58 eric Exp $ */ /* * Copyright (c) 2013 Eric Faurot @@ -269,7 +269,6 @@ table_create(struct smtpd *conf, const char *backend, const char *name, const ch fatalx("table_create: table name too long"); } - dict_init(&t->t_dict); dict_set(conf->sc_tables_dict, t->t_name, t); return (t); @@ -278,11 +277,6 @@ table_create(struct smtpd *conf, const char *backend, const char *name, const ch void table_destroy(struct smtpd *conf, struct table *t) { - void *p = NULL; - - while (dict_poproot(&t->t_dict, (void **)&p)) - free(p); - dict_xpop(conf->sc_tables_dict, t->t_name); free(t); } -- 2.20.1