diff options
| author |   florian <florian@openbsd.org> | 2017-02-17 20:04:45 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2017-02-17 20:04:45 +0000 |
| commit | fe5fe5f6cfa8bb64bb38bafa85c14c1d131dfe6d (patch) | |
| tree | 45b00c569386cd492431a724f9097b87e41209b3 /usr.sbin/nsd/nsd-mem.c | |
| parent | Fix up and use the device memory attribute for device mappings. Add (diff) | |
| download | wireguard-openbsd-fe5fe5f6cfa8bb64bb38bafa85c14c1d131dfe6d.tar.xz wireguard-openbsd-fe5fe5f6cfa8bb64bb38bafa85c14c1d131dfe6d.zip | |
Update to 4.1.15.
This contains a local patch to query.c (missed _t conversion) that has
been submitted upstream.
OK sthen
Diffstat (limited to 'usr.sbin/nsd/nsd-mem.c')
| -rw-r--r-- | usr.sbin/nsd/nsd-mem.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/nsd/nsd-mem.c b/usr.sbin/nsd/nsd-mem.c index 105b88dad14..9383f84861a 100644 --- a/usr.sbin/nsd/nsd-mem.c +++ b/usr.sbin/nsd/nsd-mem.c @@ -139,7 +139,7 @@ print_zone_mem(struct zone_mem* z) } static void -account_total(nsd_options_t* opt, struct tot_mem* t) +account_total(struct nsd_options* opt, struct tot_mem* t) { t->opt_data = region_get_mem(opt->region); t->opt_unused = region_get_mem_unused(opt->region); @@ -192,8 +192,8 @@ add_mem(struct tot_mem* t, struct zone_mem* z) } static void -check_zone_mem(const char* tf, const char* df, zone_options_t* zo, - nsd_options_t* opt, struct tot_mem* totmem) +check_zone_mem(const char* tf, const char* df, struct zone_options* zo, + struct nsd_options* opt, struct tot_mem* totmem) { struct nsd nsd; struct namedb* db; @@ -234,10 +234,10 @@ check_zone_mem(const char* tf, const char* df, zone_options_t* zo, } static void -check_mem(nsd_options_t* opt) +check_mem(struct nsd_options* opt) { struct tot_mem totmem; - zone_options_t* zo; + struct zone_options* zo; char tf[512]; char df[512]; memset(&totmem, 0, sizeof(totmem)); @@ -247,7 +247,7 @@ check_mem(nsd_options_t* opt) else snprintf(df, sizeof(df), "./nsd-mem-db-%u.db", (unsigned)getpid()); /* read all zones and account memory */ - RBTREE_FOR(zo, zone_options_t*, opt->zone_options) { + RBTREE_FOR(zo, struct zone_options*, opt->zone_options) { check_zone_mem(tf, df, zo, opt, &totmem); } |