summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2012-10-11 21:43:12 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2012-10-11 21:43:12 +0000
commit7a2825266648e194c3823ec648ab51780113d09d (patch)
treef8c2df38eb64297dbf1190f9f03e583a7834bb10 /usr.sbin
parent798300fb0fa1a3439a2f06a1ce55c03d27d3ca8f (diff)
- map_create() takes a map_src not a map_kind
ok eric@ and chl@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/smtpd/map.c6
-rw-r--r--usr.sbin/smtpd/smtpd.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/smtpd/map.c b/usr.sbin/smtpd/map.c
index 8c5665814a8..ddbf1982afc 100644
--- a/usr.sbin/smtpd/map.c
+++ b/usr.sbin/smtpd/map.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: map.c,v 1.31 2012/09/26 12:28:08 eric Exp $ */
+/* $OpenBSD: map.c,v 1.32 2012/10/11 21:43:11 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -140,7 +140,7 @@ map_compare(objid_t mapid, const char *key, enum map_kind kind,
}
struct map*
-map_create(enum map_kind kind, const char *name)
+map_create(enum map_src src, const char *name)
{
struct map *m;
size_t n;
@@ -149,7 +149,7 @@ map_create(enum map_kind kind, const char *name)
errx(1, "map_create: map \"%s\" already defined", name);
m = xcalloc(1, sizeof(*m), "map_create");
- m->m_src = kind;
+ m->m_src = src;
m->m_id = ++last_map_id;
if (m->m_id == INT_MAX)
errx(1, "map_create: too many maps defined");
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index dd5c8f9f409..76302dcaf8e 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.h,v 1.386 2012/10/11 21:14:32 gilles Exp $ */
+/* $OpenBSD: smtpd.h,v 1.387 2012/10/11 21:43:11 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -977,7 +977,7 @@ int map_compare(objid_t, const char *, enum map_kind,
int (*)(const char *, const char *));
struct map *map_find(objid_t);
struct map *map_findbyname(const char *);
-struct map *map_create(enum map_kind, const char *);
+struct map *map_create(enum map_src, const char *);
void map_add(struct map *, const char *, const char *);