aboutsummaryrefslogtreecommitdiff
path: root/src/gdbmtool.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gdbmtool.c')
-rw-r--r--src/gdbmtool.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/src/gdbmtool.c b/src/gdbmtool.c
index 18d0e10..33bdf93 100644
--- a/src/gdbmtool.c
+++ b/src/gdbmtool.c
@@ -192,13 +192,12 @@ size_t
_gdbm_avail_list_size (GDBM_FILE dbf, size_t min_size)
{
int temp;
int size;
avail_block *av_stk;
size_t lines;
- int rc;
lines = 4 + dbf->header->avail.count;
if (lines > min_size)
return lines;
/* Initialize the variables for a pass throught the avail stack. */
temp = dbf->header->avail.next_block;
@@ -212,19 +211,15 @@ _gdbm_avail_list_size (GDBM_FILE dbf, size_t min_size)
if (__lseek (dbf, temp, SEEK_SET) != temp)
{
terror ("lseek: %s", strerror (errno));
break;
}
- if ((rc = _gdbm_full_read (dbf, av_stk, size)))
+ if (_gdbm_full_read (dbf, av_stk, size))
{
- if (rc == GDBM_FILE_EOF)
- terror ("read: %s", gdbm_strerror (rc));
- else
- terror ("read: %s (%s)",
- gdbm_strerror (rc), strerror (errno));
+ terror ("read: %s", gdbm_db_strerror (dbf));
break;
}
if (gdbm_avail_block_valid_p (av_stk))
{
lines += av_stk->count;
@@ -253,13 +248,12 @@ av_table_display (avail_elem *av_table, int count, FILE *fp)
void
_gdbm_print_avail_list (FILE *fp, GDBM_FILE dbf)
{
int temp;
int size;
avail_block *av_stk;
- int rc;
/* Print the the header avail block. */
fprintf (fp, _("\nheader block\nsize = %d\ncount = %d\n"),
dbf->header->avail.size, dbf->header->avail.count);
av_table_display (dbf->header->avail.av_table, dbf->header->avail.count, fp);
@@ -275,18 +269,15 @@ _gdbm_print_avail_list (FILE *fp, GDBM_FILE dbf)
if (__lseek (dbf, temp, SEEK_SET) != temp)
{
terror ("lseek: %s", strerror (errno));
break;
}
- if ((rc = _gdbm_full_read (dbf, av_stk, size)))
+ if (_gdbm_full_read (dbf, av_stk, size))
{
- if (rc == GDBM_FILE_EOF)
- terror ("read: %s", gdbm_strerror (rc));
- else
- terror ("read: %s (%s)", gdbm_strerror (rc), strerror (errno));
+ terror ("read: %s", gdbm_db_strerror (dbf));
break;
}
/* Print the block! */
fprintf (fp, _("\nblock = %d\nsize = %d\ncount = %d\n"), temp,
av_stk->size, av_stk->count);

Return to:

Send suggestions and report system problems to the System administrator.