diff options
| author | Miles Bader <miles@gnu.org> | 1996-09-23 19:58:12 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 1996-09-23 19:58:12 +0000 |
| commit | 146d1c1ad94e706942eb7388c7314a8f8b4f0365 (patch) | |
| tree | d873f77422bcecde01d113aa1ba8cce2fa2f31f1 | |
| parent | cb814398f53cbdbdd5f7174c3c54cd6f61396363 (diff) | |
(dev_open):
Remove CLASSES argument to store_parsed_open.
(dev_buf_fill, dev_read, dev_write):
Use void * buffers.
| -rw-r--r-- | storeio/dev.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storeio/dev.c b/storeio/dev.c index 6297f3b7..9d9c375b 100644 --- a/storeio/dev.c +++ b/storeio/dev.c @@ -65,7 +65,7 @@ dev_buf_fill (struct dev *dev, off_t offs) { error_t err; unsigned block_mask = dev->block_mask; - char *buf = dev->buf; + void *buf = dev->buf; struct store *store = dev->store; size_t buf_len = store->block_size; @@ -144,7 +144,7 @@ dev_open (struct store_parsed *name, int flags, struct dev **dev) if (! new) return ENOMEM; - err = store_parsed_open (name, flags, 0, &new->store); + err = store_parsed_open (name, flags, &new->store); if (err) { free (new); @@ -311,7 +311,7 @@ dev_rw (struct dev *dev, off_t offs, size_t len, size_t *amount, AMOUNT. If successful, 0 is returned, otherwise an error code is returned. */ error_t -dev_write (struct dev *dev, off_t offs, char *buf, size_t len, +dev_write (struct dev *dev, off_t offs, void *buf, size_t len, size_t *amount) { error_t buf_write (size_t buf_offs, size_t io_offs, size_t len) @@ -336,7 +336,7 @@ dev_write (struct dev *dev, off_t offs, char *buf, size_t len, returned, otherwise an error code is returned. */ error_t dev_read (struct dev *dev, off_t offs, size_t whole_amount, - char **buf, size_t *len) + void **buf, size_t *len) { error_t err; int allocated_buf = 0; @@ -376,7 +376,7 @@ dev_read (struct dev *dev, off_t offs, size_t whole_amount, error_t err = ensure_buf (); if (! err) { - char *_req_buf = *buf + io_offs, *req_buf = _req_buf; + void *_req_buf = *buf + io_offs, *req_buf = _req_buf; size_t req_len = len; err = store_read (store, addr, len, &req_buf, &req_len); if (! err) |