Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edb
Dir : e17/libs/edb/src
Modified Files:
bt_curadj.c e_db.c edb_rec.c hash_rec.c mp_fget.c mp_fput.c
Log Message:
fixed some warnings
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edb/src/bt_curadj.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- bt_curadj.c 9 Mar 2001 01:30:40 -0000 1.2
+++ bt_curadj.c 11 Jul 2004 09:06:25 -0000 1.3
@@ -249,7 +249,7 @@
for (edbc = TAILQ_FIRST(&edbp->active_queue);
edbc != NULL; edbc = TAILQ_NEXT(edbc, links)) {
cp = (CURSOR *)edbc->internal;
- if (cp->pgno == ppgno)
+ if (cp->pgno == ppgno) {
if (cp->indx < split_indx) {
if (cleft)
cp->pgno = lpgno;
@@ -257,7 +257,9 @@
cp->pgno = rpgno;
cp->indx -= split_indx;
}
- if (cp->dpgno == ppgno)
+ }
+
+ if (cp->dpgno == ppgno) {
if (cp->dindx < split_indx) {
if (cleft)
cp->dpgno = lpgno;
@@ -265,6 +267,7 @@
cp->dpgno = rpgno;
cp->dindx -= split_indx;
}
+ }
}
DB_THREAD_UNLOCK(edbp);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edb/src/e_db.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_db.c 5 Apr 2004 03:00:02 -0000 1.22
+++ e_db.c 11 Jul 2004 09:06:25 -0000 1.23
@@ -419,7 +419,6 @@
e_db_set_type(E_DB_File * edb, char *value) {
char *type;
char *existing;
- int lenght;
if (!e_db_is_type(edb, value))
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edb/src/edb_rec.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edb_rec.c 9 Mar 2001 01:30:40 -0000 1.1
+++ edb_rec.c 11 Jul 2004 09:06:25 -0000 1.2
@@ -88,11 +88,12 @@
change = DB_MPOOL_DIRTY;
}
- if (change)
+ if (change) {
if (redo)
LSN(pagep) = *lsnp;
else
LSN(pagep) = argp->pagelsn;
+ }
if ((ret = memp_fput(mpf, pagep, change)) != 0)
goto out;
@@ -124,7 +125,7 @@
REC_PRINT(__edb_split_print);
REC_INTRO(__edb_split_read);
- if ((ret = memp_fget(mpf, &argp->pgno, 0, &pagep)) != 0)
+ if ((ret = memp_fget(mpf, &argp->pgno, 0, &pagep)) != 0) {
if (!redo) {
/*
* We are undoing and the page doesn't exist. That
@@ -137,6 +138,7 @@
if ((ret = memp_fget(mpf,
&argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0)
goto out;
+ }
/*
* There are two types of log messages here, one for the old page
@@ -253,7 +255,7 @@
/* Now check the previous page. */
ppage: if (argp->prev_pgno != PGNO_INVALID) {
change = 0;
- if ((ret = memp_fget(mpf, &argp->prev_pgno, 0, &pagep)) != 0)
+ if ((ret = memp_fget(mpf, &argp->prev_pgno, 0, &pagep)) != 0) {
if (!redo) {
/*
* We are undoing and the page doesn't exist.
@@ -268,6 +270,7 @@
if ((ret = memp_fget(mpf, &argp->prev_pgno,
DB_MPOOL_CREATE, &pagep)) != 0)
goto out;
+ }
cmp_n = log_compare(lsnp, &LSN(pagep));
cmp_p = log_compare(&LSN(pagep), &argp->prevlsn);
@@ -544,7 +547,7 @@
if ((ret = memp_fput(mpf, pagep, change)) != 0)
goto out;
- if ((ret = memp_fget(mpf, &argp->nextpgno, 0, &pagep)) != 0)
+ if ((ret = memp_fget(mpf, &argp->nextpgno, 0, &pagep)) != 0) {
if (!redo) {
/*
* We are undoing and the page doesn't exist. That
@@ -557,6 +560,7 @@
if ((ret = memp_fget(mpf,
&argp->nextpgno, DB_MPOOL_CREATE, &pagep)) != 0)
goto out;
+ }
change = 0;
cmp_n = log_compare(lsnp, &LSN(pagep));
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edb/src/hash_rec.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- hash_rec.c 9 Mar 2001 01:30:40 -0000 1.2
+++ hash_rec.c 11 Jul 2004 09:06:25 -0000 1.3
@@ -95,7 +95,7 @@
hcp = (HASH_CURSOR *)edbc->internal;
ret = memp_fget(mpf, &argp->pgno, 0, &pagep);
- if (ret != 0)
+ if (ret != 0) {
if (!redo) {
/*
* We are undoing and the page doesn't exist. That
@@ -107,7 +107,7 @@
} else if ((ret = memp_fget(mpf, &argp->pgno,
DB_MPOOL_CREATE, &pagep)) != 0)
goto out;
-
+ }
GET_META(file_edbp, hcp, ret);
if (ret != 0)
@@ -203,7 +203,7 @@
hcp = (HASH_CURSOR *)edbc->internal;
ret = memp_fget(mpf, &argp->new_pgno, 0, &pagep);
- if (ret != 0)
+ if (ret != 0) {
if (!redo) {
/*
* We are undoing and the page doesn't exist. That
@@ -216,6 +216,7 @@
} else if ((ret = memp_fget(mpf, &argp->new_pgno,
DB_MPOOL_CREATE, &pagep)) != 0)
goto out;
+ }
GET_META(file_edbp, (HASH_CURSOR *)edbc->internal, ret);
if (ret != 0)
@@ -260,7 +261,7 @@
ppage: if (argp->prev_pgno != PGNO_INVALID) {
ret = memp_fget(mpf, &argp->prev_pgno, 0, &pagep);
- if (ret != 0)
+ if (ret != 0) {
if (!redo) {
/*
* We are undoing and the page doesn't exist.
@@ -274,6 +275,7 @@
memp_fget(mpf, &argp->prev_pgno,
DB_MPOOL_CREATE, &pagep)) != 0)
goto out;
+ }
cmp_n = log_compare(lsnp, &LSN(pagep));
cmp_p = log_compare(&LSN(pagep), &argp->prevlsn);
@@ -307,7 +309,7 @@
npage: if (argp->next_pgno != PGNO_INVALID) {
ret = memp_fget(mpf, &argp->next_pgno, 0, &pagep);
- if (ret != 0)
+ if (ret != 0) {
if (!redo) {
/*
* We are undoing and the page doesn't exist.
@@ -320,6 +322,7 @@
memp_fget(mpf, &argp->next_pgno,
DB_MPOOL_CREATE, &pagep)) != 0)
goto out;
+ }
cmp_n = log_compare(lsnp, &LSN(pagep));
cmp_p = log_compare(&LSN(pagep), &argp->nextlsn);
@@ -392,7 +395,7 @@
hcp = (HASH_CURSOR *)edbc->internal;
ret = memp_fget(mpf, &argp->pgno, 0, &pagep);
- if (ret != 0)
+ if (ret != 0) {
if (!redo) {
/*
* We are undoing and the page doesn't exist. That
@@ -404,6 +407,7 @@
} else if ((ret = memp_fget(mpf, &argp->pgno,
DB_MPOOL_CREATE, &pagep)) != 0)
goto out;
+ }
GET_META(file_edbp, (HASH_CURSOR *)edbc->internal, ret);
if (ret != 0)
@@ -529,7 +533,7 @@
/* Now check the newly allocated/freed page. */
ret = memp_fget(mpf, &argp->pgno, 0, &pagep);
- if (ret != 0)
+ if (ret != 0) {
if (!redo) {
/*
* We are undoing and the page doesn't exist. That
@@ -541,6 +545,7 @@
} else if ((ret = memp_fget(mpf, &argp->pgno,
DB_MPOOL_CREATE, &pagep)) != 0)
goto out;
+ }
cmp_n = log_compare(lsnp, &LSN(pagep));
cmp_p = log_compare(&LSN(pagep), &argp->pagelsn);
@@ -689,7 +694,7 @@
hcp = (HASH_CURSOR *)edbc->internal;
ret = memp_fget(mpf, &argp->pgno, 0, &pagep);
- if (ret != 0)
+ if (ret != 0) {
if (!redo) {
/*
* We are undoing and the page doesn't exist. That
@@ -701,6 +706,7 @@
} else if ((ret = memp_fget(mpf, &argp->pgno,
DB_MPOOL_CREATE, &pagep)) != 0)
goto out;
+ }
GET_META(file_edbp, (HASH_CURSOR *)edbc->internal, ret);
if (ret != 0)
@@ -874,7 +880,7 @@
/* This is the bucket page. */
ret = memp_fget(mpf, &argp->pgno, 0, &pagep);
- if (ret != 0)
+ if (ret != 0) {
if (!redo) {
/*
* We are undoing and the page doesn't exist. That
@@ -887,6 +893,7 @@
} else if ((ret = memp_fget(mpf, &argp->pgno,
DB_MPOOL_CREATE, &pagep)) != 0)
goto out;
+ }
cmp_n = log_compare(lsnp, &LSN(pagep));
cmp_p = log_compare(&LSN(pagep), &argp->pagelsn);
@@ -908,7 +915,7 @@
/* Now fix up the "next" page. */
donext: ret = memp_fget(mpf, &argp->next_pgno, 0, &pagep);
- if (ret != 0)
+ if (ret != 0) {
if (!redo) {
/*
* We are undoing and the page doesn't exist. That
@@ -921,6 +928,7 @@
} else if ((ret = memp_fget(mpf, &argp->next_pgno,
DB_MPOOL_CREATE, &pagep)) != 0)
goto out;
+ }
/* There is nothing to do in the REDO case; only UNDO. */
@@ -938,7 +946,7 @@
goto done;
ret = memp_fget(mpf, &argp->nnext_pgno, 0, &pagep);
- if (ret != 0)
+ if (ret != 0) {
if (!redo) {
/*
* We are undoing and the page doesn't exist. That
@@ -950,6 +958,7 @@
} else if ((ret = memp_fget(mpf, &argp->nnext_pgno,
DB_MPOOL_CREATE, &pagep)) != 0)
goto out;
+ }
cmp_n = log_compare(lsnp, &LSN(pagep));
cmp_p = log_compare(&LSN(pagep), &argp->nnextlsn);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edb/src/mp_fget.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- mp_fget.c 5 Apr 2001 16:31:34 -0000 1.3
+++ mp_fget.c 11 Jul 2004 09:06:25 -0000 1.4
@@ -140,7 +140,7 @@
* It would be possible to do so by reference counting the open
* pages from the mmap, but it's unclear to me that it's worth it.
*/
- if (edbmfp->addr != NULL && F_ISSET(mfp, MP_CAN_MMAP))
+ if (edbmfp->addr != NULL && F_ISSET(mfp, MP_CAN_MMAP)) {
if (*pgnoaddr > mfp->orig_last_pgno) {
/*
* !!!
@@ -161,6 +161,7 @@
++mfp->stat.st_map;
goto done;
}
+ }
/* Search the hash chain for the page. */
for (bhp = SH_TAILQ_FIRST(&edbmp->htab[bucket], __bh);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edb/src/mp_fput.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- mp_fput.c 9 Mar 2001 01:30:40 -0000 1.2
+++ mp_fput.c 11 Jul 2004 09:06:25 -0000 1.3
@@ -134,7 +134,7 @@
* next time the memp_sync function runs we try writing it there, as
* the checkpoint application better be able to write all of the files.
*/
- if (F_ISSET(bhp, BH_WRITE))
+ if (F_ISSET(bhp, BH_WRITE)) {
if (F_ISSET(bhp, BH_DIRTY)) {
if (__memp_bhwrite(edbmp,
edbmfp->mfp, bhp, NULL, &wrote) != 0 || !wrote)
@@ -145,6 +145,7 @@
--edbmfp->mfp->lsn_cnt;
--mp->lsn_cnt;
}
+ }
UNLOCKREGION(edbmp);
return (0);
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs