summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Grittner2013-11-07 22:35:43 +0000
committerKevin Grittner2013-11-07 22:35:43 +0000
commitb64b5ccb6a9c6877080b8ef86790e738031089d5 (patch)
treecbee0eeaef0b1cb150b9bc10b09b7312ca426977
parentc28b289bf365ab11f23460d02a43667f6a8b8bc7 (diff)
Silence benign warnings from clang version 3.0-6ubuntu3.
-rw-r--r--contrib/pg_standby/pg_standby.c2
-rw-r--r--src/backend/utils/cache/catcache.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
index a3f40fbe61a..059c8205279 100644
--- a/contrib/pg_standby/pg_standby.c
+++ b/contrib/pg_standby/pg_standby.c
@@ -345,7 +345,7 @@ SetWALFileNameForCleanup(void)
if (keepfiles > 0)
{
sscanf(nextWALFileName, "%08X%08X%08X", &tli, &log, &seg);
- if (tli > 0 && log >= 0 && seg > 0)
+ if (tli > 0 && seg > 0)
{
log_diff = keepfiles / MaxSegmentsPerLogFile;
seg_diff = keepfiles % MaxSegmentsPerLogFile;
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index c467f11ac8b..89e63258d28 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -566,8 +566,9 @@ AtEOXact_CatCache(bool isCommit)
/* Check CatCLists */
dlist_foreach(iter, &ccp->cc_lists)
{
- CatCList *cl = dlist_container(CatCList, cache_elem, iter.cur);
+ CatCList *cl;
+ cl = dlist_container(CatCList, cache_elem, iter.cur);
Assert(cl->cl_magic == CL_MAGIC);
Assert(cl->refcount == 0);
Assert(!cl->dead);
@@ -580,8 +581,9 @@ AtEOXact_CatCache(bool isCommit)
dlist_foreach(iter, bucket)
{
- CatCTup *ct = dlist_container(CatCTup, cache_elem, iter.cur);
+ CatCTup *ct;
+ ct = dlist_container(CatCTup, cache_elem, iter.cur);
Assert(ct->ct_magic == CT_MAGIC);
Assert(ct->refcount == 0);
Assert(!ct->dead);