*** ./libisofs/fs_local.c.ORIG Fri Feb 25 13:33:47 2011 --- ./libisofs/fs_local.c Fri Feb 25 13:34:21 2011 *************** *** 803,809 **** lfs->get_root = lfs_get_root; lfs->get_by_path = lfs_get_by_path; lfs->get_id = lfs_get_id; ! lfs->open = lfs_fs_open; lfs->close = lfs_fs_close; lfs->free = lfs_fs_free; } --- 803,809 ---- lfs->get_root = lfs_get_root; lfs->get_by_path = lfs_get_by_path; lfs->get_id = lfs_get_id; ! lfs->AIXopen = lfs_fs_open; lfs->close = lfs_fs_close; lfs->free = lfs_fs_free; } *** ./libisofs/libisofs.h.ORIG Fri Feb 25 13:34:54 2011 --- ./libisofs/libisofs.h Fri Feb 25 13:36:08 2011 *************** *** 310,316 **** * @return * 1 if success, < 0 on error (has to be a valid libisofs error code) */ ! int (*open)(IsoDataSource *src); /** * Close a given source, freeing all system resources previously grabbed in --- 310,316 ---- * @return * 1 if success, < 0 on error (has to be a valid libisofs error code) */ ! int (*AIXopen)(IsoDataSource *src); /** * Close a given source, freeing all system resources previously grabbed in *************** *** 479,485 **** * * @return 1 on success, < 0 on error (has to be a valid libisofs error code) */ ! int (*open)(IsoFilesystem *fs); /** * Close the filesystem, thus freeing all system resources. You should --- 479,485 ---- * * @return 1 on success, < 0 on error (has to be a valid libisofs error code) */ ! int (*AIXopen)(IsoFilesystem *fs); /** * Close the filesystem, thus freeing all system resources. You should *************** *** 601,607 **** * ISO_FILE_ERROR * ISO_NULL_POINTER */ ! int (*open)(IsoFileSource *src); /** * Close a previuously openned file --- 601,607 ---- * ISO_FILE_ERROR * ISO_NULL_POINTER */ ! int (*AIXopen)(IsoFileSource *src); /** * Close a previuously openned file *************** *** 893,899 **** * 1 on success, 2 file greater than expected, 3 file smaller than * expected, < 0 on error (has to be a valid libisofs error code) */ ! int (*open)(IsoStream *stream); /** * Close the Stream. --- 893,899 ---- * 1 on success, 2 file greater than expected, 3 file smaller than * expected, < 0 on error (has to be a valid libisofs error code) */ ! int (*AIXopen)(IsoStream *stream); /** * Close the Stream. *** ./libisofs/fs_image.c.ORIG Fri Feb 25 13:36:26 2011 --- ./libisofs/fs_image.c Fri Feb 25 13:37:35 2011 *************** *** 606,612 **** if (S_ISDIR(data->info.st_mode)) { /* ensure fs is openned */ ! ret = data->fs->open(data->fs); if (ret < 0) { return ret; } --- 606,612 ---- if (S_ISDIR(data->info.st_mode)) { /* ensure fs is openned */ ! ret = data->fs->AIXopen(data->fs); if (ret < 0) { return ret; } *************** *** 629,635 **** return ret; } else if (S_ISREG(data->info.st_mode)) { /* ensure fs is openned */ ! ret = data->fs->open(data->fs); if (ret < 0) { return ret; } --- 629,635 ---- return ret; } else if (S_ISREG(data->info.st_mode)) { /* ensure fs is openned */ ! ret = data->fs->AIXopen(data->fs); if (ret < 0) { return ret; } *************** *** 2007,2013 **** if (data->open_count == 0) { /* we need to actually open the data source */ ! int res = data->src->open(data->src); if (res < 0) { return res; } --- 2007,2013 ---- if (data->open_count == 0) { /* we need to actually open the data source */ ! int res = data->src->AIXopen(data->src); if (res < 0) { return res; } *************** *** 2527,2533 **** ifs->get_root = ifs_get_root; ifs->get_by_path = ifs_get_by_path; ifs->get_id = ifs_get_id; ! ifs->open = ifs_fs_open; ifs->close = ifs_fs_close; ifs->free = ifs_fs_free; --- 2527,2533 ---- ifs->get_root = ifs_get_root; ifs->get_by_path = ifs_get_by_path; ifs->get_id = ifs_get_id; ! ifs->AIXopen = ifs_fs_open; ifs->close = ifs_fs_close; ifs->free = ifs_fs_free; *** ./libisofs/stream.c.ORIG Fri Feb 25 13:37:54 2011 --- ./libisofs/stream.c Fri Feb 25 13:38:17 2011 *************** *** 820,826 **** inline int iso_stream_open(IsoStream *stream) { ! return stream->class->open(stream); } inline --- 820,826 ---- inline int iso_stream_open(IsoStream *stream) { ! return stream->class->AIXopen(stream); } inline *** ./libisofs/data_source.c.ORIG Fri Feb 25 13:38:42 2011 --- ./libisofs/data_source.c Fri Feb 25 13:38:52 2011 *************** *** 190,196 **** ds->refcount = 1; ds->data = data; ! ds->open = ds_open; ds->close = ds_close; ds->read_block = ds_read_block; ds->free_data = ds_free_data; --- 190,196 ---- ds->refcount = 1; ds->data = data; ! ds->AIXopen = ds_open; ds->close = ds_close; ds->read_block = ds_read_block; ds->free_data = ds_free_data; *** ./libisoburn/data_source.c.ORIG Fri Feb 25 13:43:42 2011 --- ./libisoburn/data_source.c Fri Feb 25 13:43:53 2011 *************** *** 249,255 **** ret->version = 0; ret->refcount = 1; ret->read_block = ds_read_block; ! ret->open = ds_open; ret->close = ds_close; ret->free_data = ds_free_data; ret->data = icd; --- 249,255 ---- ret->version = 0; ret->refcount = 1; ret->read_block = ds_read_block; ! ret->AIXopen = ds_open; ret->close = ds_close; ret->free_data = ds_free_data; ret->data = icd; *** ./libisofs/fsource.c.ORIG Fri Feb 25 13:44:15 2011 --- ./libisofs/fsource.c Fri Feb 25 13:44:38 2011 *************** *** 82,88 **** inline int iso_file_source_open(IsoFileSource *src) { ! return src->class->open(src); } inline --- 82,88 ---- inline int iso_file_source_open(IsoFileSource *src) { ! return src->class->AIXopen(src); } inline