From 894b78d5bcb7b609a3b52ce804306a63c4761282 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Fri, 11 Nov 2011 10:59:11 +0000 Subject: Use SEEK_SET instead of L_SET. --- src/bucket.c | 4 ++-- src/falloc.c | 4 ++-- src/findkey.c | 3 ++- src/gdbmopen.c | 2 +- src/gdbmstore.c | 2 +- src/systems.h | 4 ---- src/testgdbm.c | 4 ++-- src/update.c | 4 ++-- 8 files changed, 12 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/bucket.c b/src/bucket.c index c211f3c..0c87759 100644 --- a/src/bucket.c +++ b/src/bucket.c @@ -92,7 +92,7 @@ _gdbm_get_bucket (GDBM_FILE dbf, int dir_index) dbf->cache_entry->ca_changed = FALSE; /* Read the bucket. */ - file_pos = __lseek (dbf, bucket_adr, L_SET); + file_pos = __lseek (dbf, bucket_adr, SEEK_SET); if (file_pos != bucket_adr) _gdbm_fatal (dbf, _("lseek error")); @@ -306,7 +306,7 @@ _gdbm_write_bucket (GDBM_FILE dbf, cache_elem *ca_entry) int rc; off_t file_pos; /* The return value for lseek. */ - file_pos = __lseek (dbf, ca_entry->ca_adr, L_SET); + file_pos = __lseek (dbf, ca_entry->ca_adr, SEEK_SET); if (file_pos != ca_entry->ca_adr) _gdbm_fatal (dbf, _("lseek error")); rc = _gdbm_full_write (dbf, ca_entry->ca_bucket, dbf->header->bucket_size); diff --git a/src/falloc.c b/src/falloc.c index 6b2eca4..560ccf8 100644 --- a/src/falloc.c +++ b/src/falloc.c @@ -181,7 +181,7 @@ pop_avail_block (GDBM_FILE dbf) if (new_blk == NULL) _gdbm_fatal(dbf, _("malloc failed")); /* Read the block. */ - file_pos = __lseek (dbf, new_el.av_adr, L_SET); + file_pos = __lseek (dbf, new_el.av_adr, SEEK_SET); if (file_pos != new_el.av_adr) _gdbm_fatal (dbf, _("lseek error")); rc = _gdbm_full_read (dbf, new_blk, new_el.av_size); if (rc) @@ -278,7 +278,7 @@ push_avail_block (GDBM_FILE dbf) _gdbm_free (dbf, new_loc.av_adr, new_loc.av_size); /* Update the disk. */ - file_pos = __lseek (dbf, av_adr, L_SET); + file_pos = __lseek (dbf, av_adr, SEEK_SET); if (file_pos != av_adr) _gdbm_fatal (dbf, _("lseek error")); rc = _gdbm_full_write (dbf, temp, av_size); if (rc) diff --git a/src/findkey.c b/src/findkey.c index a375cb4..d6a6781 100644 --- a/src/findkey.c +++ b/src/findkey.c @@ -58,7 +58,8 @@ _gdbm_read_entry (GDBM_FILE dbf, int elem_loc) /* Read into the cache. */ - file_pos = __lseek (dbf, dbf->bucket->h_table[elem_loc].data_pointer, L_SET); + file_pos = __lseek (dbf, dbf->bucket->h_table[elem_loc].data_pointer, + SEEK_SET); if (file_pos != dbf->bucket->h_table[elem_loc].data_pointer) _gdbm_fatal (dbf, _("lseek error")); rc = _gdbm_full_read (dbf, data_ca->dptr, key_size+data_size); diff --git a/src/gdbmopen.c b/src/gdbmopen.c index 9909d5e..ddd82e2 100644 --- a/src/gdbmopen.c +++ b/src/gdbmopen.c @@ -381,7 +381,7 @@ gdbm_open (const char *file, int block_size, int flags, int mode, } /* Read the hash table directory. */ - file_pos = __lseek (dbf, dbf->header->dir, L_SET); + file_pos = __lseek (dbf, dbf->header->dir, SEEK_SET); if (file_pos != dbf->header->dir) { SAVE_ERRNO (gdbm_close (dbf)); diff --git a/src/gdbmstore.c b/src/gdbmstore.c index 367cc4f..aedf375 100644 --- a/src/gdbmstore.c +++ b/src/gdbmstore.c @@ -136,7 +136,7 @@ gdbm_store (GDBM_FILE dbf, datum key, datum content, int flags) dbf->bucket->h_table[elem_loc].data_size = content.dsize; /* Write the data to the file. */ - file_pos = __lseek (dbf, file_adr, L_SET); + file_pos = __lseek (dbf, file_adr, SEEK_SET); if (file_pos != file_adr) _gdbm_fatal (dbf, _("lseek error")); rc = _gdbm_full_write (dbf, key.dptr, key.dsize); if (rc) diff --git a/src/systems.h b/src/systems.h index 67b207e..c83cd9c 100644 --- a/src/systems.h +++ b/src/systems.h @@ -46,10 +46,6 @@ # define SEEK_SET 0 #endif -#ifndef L_SET -# define L_SET SEEK_SET -#endif - #ifndef O_CLOEXEC # define O_CLOEXEC 0 #endif diff --git a/src/testgdbm.c b/src/testgdbm.c index 9d026cc..409fe9a 100644 --- a/src/testgdbm.c +++ b/src/testgdbm.c @@ -123,7 +123,7 @@ _gdbm_avail_list_size (GDBM_FILE dbf, size_t min_size) /* Traverse the stack. */ while (temp) { - if (__lseek (dbf, temp, L_SET) != temp) + if (__lseek (dbf, temp, SEEK_SET) != temp) { error (0, "lseek: %s", strerror (errno)); break; @@ -177,7 +177,7 @@ _gdbm_print_avail_list (FILE *fp, GDBM_FILE dbf) /* Print the stack. */ while (temp) { - if (__lseek (dbf, temp, L_SET) != temp) + if (__lseek (dbf, temp, SEEK_SET) != temp) { error (0, "lseek: %s", strerror (errno)); break; diff --git a/src/update.c b/src/update.c index 79865c8..faefe4f 100644 --- a/src/update.c +++ b/src/update.c @@ -32,7 +32,7 @@ write_header (GDBM_FILE dbf) off_t file_pos; /* Return value for lseek. */ int rc; - file_pos = __lseek (dbf, 0L, L_SET); + file_pos = __lseek (dbf, 0L, SEEK_SET); if (file_pos != 0) _gdbm_fatal (dbf, _("lseek error")); rc = _gdbm_full_write (dbf, dbf->header, dbf->header->block_size); if (rc) @@ -78,7 +78,7 @@ _gdbm_end_update (GDBM_FILE dbf) /* Write the directory. */ if (dbf->directory_changed) { - file_pos = __lseek (dbf, dbf->header->dir, L_SET); + file_pos = __lseek (dbf, dbf->header->dir, SEEK_SET); if (file_pos != dbf->header->dir) _gdbm_fatal (dbf, _("lseek error")); rc = _gdbm_full_write (dbf, dbf->dir, dbf->header->dir_size); if (rc) -- cgit v1.2.1