diff options
| author | Martin Thomson <martin.thomson@gmail.com> | 2015-08-07 17:34:12 -0700 |
|---|---|---|
| committer | Martin Thomson <martin.thomson@gmail.com> | 2015-08-07 17:34:12 -0700 |
| commit | df18e4c7e5e9ad31fab45575896fba7d2bc24250 (patch) | |
| tree | f07ff7f0e8d1d06e564917eb58af355c1fa7d456 /lib/base | |
| parent | c084b875adee244f5f56dd03e8948239d1f6c076 (diff) | |
| download | nss-hg-df18e4c7e5e9ad31fab45575896fba7d2bc24250.tar.gz | |
Bug 1182667 - Removing warnings, enabling -Werror, r=rrelyea
Diffstat (limited to 'lib/base')
| -rw-r--r-- | lib/base/hash.c | 4 | ||||
| -rw-r--r-- | lib/base/list.c | 3 | ||||
| -rw-r--r-- | lib/base/tracker.c | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/lib/base/hash.c b/lib/base/hash.c index 514e547ac..7eaaf6ff0 100644 --- a/lib/base/hash.c +++ b/lib/base/hash.c @@ -51,9 +51,7 @@ nss_identity_hash const void *key ) { - PRUint32 i = (PRUint32)key; - PR_ASSERT(sizeof(PLHashNumber) == sizeof(PRUint32)); - return (PLHashNumber)i; + return (PLHashNumber)((char *)key - (char *)NULL); } static PLHashNumber diff --git a/lib/base/list.c b/lib/base/list.c index d6773d743..5f34923b2 100644 --- a/lib/base/list.c +++ b/lib/base/list.c @@ -217,9 +217,8 @@ nsslist_add_element(nssList *list, void *data) NSS_IMPLEMENT PRStatus nssList_Add(nssList *list, void *data) { - PRStatus nssrv; NSSLIST_LOCK_IF(list); - nssrv = nsslist_add_element(list, data); + (void)nsslist_add_element(list, data); NSSLIST_UNLOCK_IF(list); return PR_SUCCESS; } diff --git a/lib/base/tracker.c b/lib/base/tracker.c index 95881f911..06e2baf2a 100644 --- a/lib/base/tracker.c +++ b/lib/base/tracker.c @@ -29,7 +29,7 @@ identity_hash const void *key ) { - return (PLHashNumber)key; + return (PLHashNumber)((char *)key - (char *)NULL); } /* |