diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2012-11-15 13:32:12 +0100 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2012-11-15 13:32:12 +0100 |
| commit | 4b36f8277c612eb2f71e4f45374156ead73e81a5 (patch) | |
| tree | cbe3d512d7962eda642fa64bef48f3959a82f285 | |
| parent | - enum map_type -> enum table_type (diff) | |
| parent | - fix warnings caused by me not having enough coffee (diff) | |
| download | OpenSMTPD-4b36f8277c612eb2f71e4f45374156ead73e81a5.tar.xz OpenSMTPD-4b36f8277c612eb2f71e4f45374156ead73e81a5.zip | |
Merge branch 'master' into table
Conflicts:
smtpd/smtpd.h
| -rw-r--r-- | smtpd/map.c | 2 | ||||
| -rw-r--r-- | smtpd/map_static.c | 4 | ||||
| -rw-r--r-- | smtpd/smtpd.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/smtpd/map.c b/smtpd/map.c index 2aa79b8b..89e8024c 100644 --- a/smtpd/map.c +++ b/smtpd/map.c @@ -272,7 +272,7 @@ map_update(struct map *m) } int -map_config_parser(struct map *m, char *config) +map_config_parser(struct map *m, const char *config) { FILE *fp; char *buf, *lbuf; diff --git a/smtpd/map_static.c b/smtpd/map_static.c index de41d512..9b5a2c78 100644 --- a/smtpd/map_static.c +++ b/smtpd/map_static.c @@ -71,8 +71,8 @@ map_static_config(struct map *map, const char *config) static int map_static_update(struct map *map, const char *config) { - struct map *m; - char *name[MAX_LINE_SIZE]; + struct map *m; + char name[MAX_LINE_SIZE]; /* no config ? ok */ if (config == NULL) diff --git a/smtpd/smtpd.h b/smtpd/smtpd.h index c6c40789..6d2d3146 100644 --- a/smtpd/smtpd.h +++ b/smtpd/smtpd.h @@ -294,7 +294,7 @@ struct map { struct map_backend { int (*config)(struct map *, const char *); void *(*open)(struct map *); - void (*update)(struct map *, const char *); + int (*update)(struct map *, const char *); void (*close)(void *); void *(*lookup)(void *, const char *, enum table_kind); int (*compare)(void *, const char *, enum table_kind, @@ -1018,7 +1018,7 @@ struct map_backend *map_backend_lookup(const char *); void *map_open(struct map *); void map_update(struct map *); void map_close(struct map *, void *); -int map_config_parser(struct map *, char *); +int map_config_parser(struct map *, const char *); void *map_lookup(objid_t, const char *, enum table_kind); int map_compare(objid_t, const char *, enum table_kind, int (*)(const char *, const char *)); |