aboutsummaryrefslogtreecommitdiff
path: root/db2/common
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-09-07 11:07:34 +0000
committerUlrich Drepper <drepper@redhat.com>1998-09-07 11:07:34 +0000
commit2c874db2dd8b34a36f00284c2c5d215a4c9506ac (patch)
tree679922799ac611eeff4513bfb7b0f880f1277b4f /db2/common
parent88c9111883a14f2f3fd31471df6923f76b97e1a0 (diff)
downloadglibc-2c874db2dd8b34a36f00284c2c5d215a4c9506ac.tar
glibc-2c874db2dd8b34a36f00284c2c5d215a4c9506ac.tar.gz
glibc-2c874db2dd8b34a36f00284c2c5d215a4c9506ac.tar.bz2
glibc-2c874db2dd8b34a36f00284c2c5d215a4c9506ac.zip
Update.
* db2/btree/bt_cursor.c: Likewise. * db2/common/db_region.db_c: Likewise. * db2/common/db_salloc.db_c: Likewise. * db2/db/db.c: Likewise. * db2/db/db_rec.c: Likewise. * db2/hash/hash.c: Likewise. * db2/hash/hash_page.c: Likewise. * db2/hash/hash_rec.c: Likewise. * db2/log/log_findckp.c: Likewise. * db2/log/log_get.c: Likewise. * db2/log/log_put.c: Likewise. * db2/mp/mp_fget.c: Likewise. * db2/mp/mp_fput.c: Likewise. * db2/mp/mp_region.c: Likewise.
Diffstat (limited to 'db2/common')
-rw-r--r--db2/common/db_region.c11
-rw-r--r--db2/common/db_salloc.c3
2 files changed, 8 insertions, 6 deletions
diff --git a/db2/common/db_region.c b/db2/common/db_region.c
index 6d15f7f092..284af6176a 100644
--- a/db2/common/db_region.c
+++ b/db2/common/db_region.c
@@ -272,7 +272,7 @@ loop: infop->addr = NULL;
* obvious races in doing this, but it should eventually settle down
* to a winner and then things should proceed normally.
*/
- if ((ret = __db_mapregion(infop->name, infop)) != 0)
+ if ((ret = __db_mapregion(infop->name, infop)) != 0) {
if (ret == EAGAIN) {
/*
* Pretend we created the region even if we didn't so
@@ -283,7 +283,7 @@ loop: infop->addr = NULL;
goto retry;
} else
goto err;
-
+ }
region_init:
/*
* Initialize the common region information.
@@ -474,7 +474,7 @@ retry: /* Discard the region. */
* REGION_LASTDETACH flag, so that we do all necessary cleanup when
* the application closes the region.
*/
- if (F_ISSET(infop, REGION_PRIVATE) && !F_ISSET(infop, REGION_MALLOC))
+ if (F_ISSET(infop, REGION_PRIVATE) && !F_ISSET(infop, REGION_MALLOC)) {
if (F_ISSET(infop, REGION_HOLDINGSYS))
F_SET(infop, REGION_LASTDETACH);
else {
@@ -484,7 +484,7 @@ retry: /* Discard the region. */
(void)__db_close(infop->fd);
(void)__db_unlink(infop->name);
}
-
+ }
return (ret);
}
@@ -537,12 +537,13 @@ __db_rdetach(infop)
* what happened.
*/
detach = 0;
- if (F_ISSET(infop, REGION_LASTDETACH))
+ if (F_ISSET(infop, REGION_LASTDETACH)) {
if (rlp->refcnt == 0) {
detach = 1;
rlp->valid = 0;
} else
ret = EBUSY;
+ }
/* Release the lock. */
(void)__db_mutex_unlock(&rlp->lock, infop->fd);
diff --git a/db2/common/db_salloc.c b/db2/common/db_salloc.c
index 0fa696bf7e..c02d7e18e9 100644
--- a/db2/common/db_salloc.c
+++ b/db2/common/db_salloc.c
@@ -222,11 +222,12 @@ __db_shalloc_free(regionp, ptr)
merged = 1;
}
- if (!merged)
+ if (!merged) {
if (lastp == NULL)
SH_LIST_INSERT_HEAD(hp, newp, links, __data);
else
SH_LIST_INSERT_AFTER(lastp, newp, links, __data);
+ }
}
/*