From f4a12fc67689a830e9da1c87fd11afe5bc09deb3 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 2 Jan 2020 21:06:40 +0100 Subject: Issue #1338 - Part 2: Update NSS to 3.48-RTM --- security/nss/lib/dbm/src/db.c | 1 - security/nss/lib/dbm/src/h_bigkey.c | 1 - security/nss/lib/dbm/src/h_func.c | 1 - security/nss/lib/dbm/src/h_log2.c | 1 - security/nss/lib/dbm/src/h_page.c | 1 - security/nss/lib/dbm/src/hash.c | 1 - security/nss/lib/dbm/src/hash_buf.c | 1 - 7 files changed, 7 deletions(-) (limited to 'security/nss/lib/dbm/src') diff --git a/security/nss/lib/dbm/src/db.c b/security/nss/lib/dbm/src/db.c index 4b5810760..1cad5a5d9 100644 --- a/security/nss/lib/dbm/src/db.c +++ b/security/nss/lib/dbm/src/db.c @@ -131,5 +131,4 @@ dbm_dbpanic(DB *dbp) dbp->put = (int (*)(const struct dbm_db *, DBT *, const DBT *, uint))dbm_dberr; dbp->seq = (int (*)(const struct dbm_db *, DBT *, DBT *, uint))dbm_dberr; dbp->sync = (int (*)(const struct dbm_db *, uint))dbm_dberr; - } diff --git a/security/nss/lib/dbm/src/h_bigkey.c b/security/nss/lib/dbm/src/h_bigkey.c index 795c7a09d..30f3ba690 100644 --- a/security/nss/lib/dbm/src/h_bigkey.c +++ b/security/nss/lib/dbm/src/h_bigkey.c @@ -704,5 +704,4 @@ dbm_big_split( else ret->oldp = tmpp; return (0); - } diff --git a/security/nss/lib/dbm/src/h_func.c b/security/nss/lib/dbm/src/h_func.c index 897060992..795d1143a 100644 --- a/security/nss/lib/dbm/src/h_func.c +++ b/security/nss/lib/dbm/src/h_func.c @@ -205,4 +205,3 @@ hash4(const void *keyarg, register size_t len) } return (h); } - diff --git a/security/nss/lib/dbm/src/h_log2.c b/security/nss/lib/dbm/src/h_log2.c index 0e91fd042..bb26f9aaf 100644 --- a/security/nss/lib/dbm/src/h_log2.c +++ b/security/nss/lib/dbm/src/h_log2.c @@ -51,5 +51,4 @@ dbm_log2(uint32 num) for (i = 0; limit < num; limit = limit << 1, i++) { } return (i); - } diff --git a/security/nss/lib/dbm/src/h_page.c b/security/nss/lib/dbm/src/h_page.c index e6f61c623..d4e4ff601 100644 --- a/security/nss/lib/dbm/src/h_page.c +++ b/security/nss/lib/dbm/src/h_page.c @@ -1264,5 +1264,4 @@ print_chain(int addr) } (void)fprintf(stderr, "\n"); } - #endif diff --git a/security/nss/lib/dbm/src/hash.c b/security/nss/lib/dbm/src/hash.c index 100bbad27..2c2ce9d87 100644 --- a/security/nss/lib/dbm/src/hash.c +++ b/security/nss/lib/dbm/src/hash.c @@ -1168,5 +1168,4 @@ swap_header(HTAB *hashp) M_16_SWAP(hdrp->bitmaps[i]); } } - #endif diff --git a/security/nss/lib/dbm/src/hash_buf.c b/security/nss/lib/dbm/src/hash_buf.c index 02deb81c5..1ccba01ee 100644 --- a/security/nss/lib/dbm/src/hash_buf.c +++ b/security/nss/lib/dbm/src/hash_buf.c @@ -404,5 +404,4 @@ dbm_reclaim_buf(HTAB *hashp, BUFHEAD *bp) bp->flags = 0; BUF_REMOVE(bp); LRU_INSERT(bp); - } -- cgit v1.2.3