From 648941cb15351f22b56e2eeb428b61388929468d Mon Sep 17 00:00:00 2001 From: Vreixo Formoso Date: Sat, 8 Mar 2008 21:48:03 +0100 Subject: [PATCH] lseek() needs to be added to the end to ensure ABI compatibility. --- libisofs/fs_image.c | 4 ++-- libisofs/fs_local.c | 4 ++-- libisofs/libisofs.h | 39 ++++++++++++++++++++------------------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/libisofs/fs_image.c b/libisofs/fs_image.c index 54bb456..cbe991f 100644 --- a/libisofs/fs_image.c +++ b/libisofs/fs_image.c @@ -825,11 +825,11 @@ IsoFileSourceIface ifs_class = { ifs_open, ifs_close, ifs_read, - ifs_lseek, ifs_readdir, ifs_readlink, ifs_get_filesystem, - ifs_free + ifs_free, + ifs_lseek }; /** diff --git a/libisofs/fs_local.c b/libisofs/fs_local.c index e9c61a1..43a2a93 100644 --- a/libisofs/fs_local.c +++ b/libisofs/fs_local.c @@ -476,11 +476,11 @@ IsoFileSourceIface lfs_class = { lfs_open, lfs_close, lfs_read, - lfs_lseek, lfs_readdir, lfs_readlink, lfs_get_filesystem, - lfs_free + lfs_free, + lfs_lseek }; /** diff --git a/libisofs/libisofs.h b/libisofs/libisofs.h index e2decce..30338f1 100644 --- a/libisofs/libisofs.h +++ b/libisofs/libisofs.h @@ -559,25 +559,6 @@ struct IsoFileSource_Iface * ISO_INTERRUPTED */ int (*read)(IsoFileSource *src, void *buf, size_t count); - - /** - * Repositions the offset of the IsoFileSource (must be opened) to the - * given offset according to the value of flag. - * - * @param offset - * in bytes - * @param flag - * 0 The offset is set to offset bytes (SEEK_SET) - * 1 The offset is set to its current location plus offset bytes - * (SEEK_CUR) - * 2 The offset is set to the size of the file plus offset bytes - * (SEEK_END). - * @return - * Absolute offset posistion on the file, or < 0 on error. Cast the - * returning value to int to get a valid libisofs error. - * @since 0.6.4 - */ - off_t (*lseek)(IsoFileSource *src, off_t offset, int flag); /** * Read a directory. @@ -641,6 +622,26 @@ struct IsoFileSource_Iface * Use iso_file_source_unref() instead. */ void (*free)(IsoFileSource *src); + + /** + * Repositions the offset of the IsoFileSource (must be opened) to the + * given offset according to the value of flag. + * + * @param offset + * in bytes + * @param flag + * 0 The offset is set to offset bytes (SEEK_SET) + * 1 The offset is set to its current location plus offset bytes + * (SEEK_CUR) + * 2 The offset is set to the size of the file plus offset bytes + * (SEEK_END). + * @return + * Absolute offset posistion on the file, or < 0 on error. Cast the + * returning value to int to get a valid libisofs error. + * + * @since 0.6.4 + */ + off_t (*lseek)(IsoFileSource *src, off_t offset, int flag); /* * TODO #00004 Add a get_mime_type() function.