# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: scdbackup@gmx.net-20080826140904-560ue4190dxxyljs
# target_branch: http://bazaar.launchpad.net/~metalpain2002/libisofs\
# /vreixoml
# testament_sha1: c97962a699e81bc7243c3897586f4b3270105fd3
# timestamp: 2008-08-26 16:11:34 +0200
# base_revision_id: metalpain2002@yahoo.es-20080820001447-\
# a2jw3bxleh0o3t7r
#
# Begin patch
=== modified file 'configure.ac'
|
|
|
|
| 1 | | AC_INIT([libisofs], [0.6.6], [http://libburnia-project.org]) |
| | 1 | AC_INIT([libisofs], [0.6.7], [http://libburnia-project.org]) |
| 2 | 2 | AC_PREREQ([2.50]) |
| 3 | 3 | dnl AC_CONFIG_HEADER([config.h]) |
| 4 | 4 | |
| … |
… |
|
| 44 | 44 | dnl |
| 45 | 45 | LIBISOFS_MAJOR_VERSION=0 |
| 46 | 46 | LIBISOFS_MINOR_VERSION=6 |
| 47 | | LIBISOFS_MICRO_VERSION=6 |
| | 47 | LIBISOFS_MICRO_VERSION=7 |
| 48 | 48 | LIBISOFS_VERSION=$LIBISOFS_MAJOR_VERSION.$LIBISOFS_MINOR_VERSION.$LIBISOFS_MICRO_VERSION |
| 49 | 49 | |
| 50 | 50 | AC_SUBST(LIBISOFS_MAJOR_VERSION) |
| … |
… |
|
| 54 | 54 | |
| 55 | 55 | dnl Libtool versioning |
| 56 | 56 | LT_RELEASE=$LIBISOFS_MAJOR_VERSION.$LIBISOFS_MINOR_VERSION |
| 57 | | # SONAME = 6 - 0 = 6 . Library name = libisofs.6.0.0 |
| 58 | | LT_CURRENT=7 |
| | 57 | # SONAME = 8 - 2 = 6 . Library name = libisofs.6.2.0 |
| | 58 | LT_CURRENT=8 |
| 59 | 59 | LT_REVISION=0 |
| 60 | | LT_AGE=1 |
| | 60 | LT_AGE=2 |
| 61 | 61 | LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` |
| 62 | 62 | |
| 63 | 63 | AC_SUBST(LT_RELEASE) |
=== modified file 'libisofs/libisofs.h'
|
|
|
|
| 280 | 280 | * Buffer where the data will be written. It should have at least |
| 281 | 281 | * 2048 bytes. |
| 282 | 282 | * @return |
| 283 | | * 1 if success, < 0 on error (has to be a valid libisofs error code) |
| | 283 | * 1 if success, |
| | 284 | * < 0 if error. This function has to emit a valid libisofs error code. |
| | 285 | * Predifined (but not mandatory) for this purpose are: |
| | 286 | * ISO_DATA_SOURCE_SORRY , ISO_DATA_SOURCE_MISHAP, |
| | 287 | * ISO_DATA_SOURCE_FAILURE , ISO_DATA_SOURCE_FATAL |
| 284 | 288 | */ |
| 285 | 289 | int (*read_block)(IsoDataSource *src, uint32_t lba, uint8_t *buffer); |
| 286 | 290 | |
| … |
… |
|
| 867 | 871 | */ |
| 868 | 872 | #define iso_lib_header_version_major 0 |
| 869 | 873 | #define iso_lib_header_version_minor 6 |
| 870 | | #define iso_lib_header_version_micro 6 |
| | 874 | #define iso_lib_header_version_micro 7 |
| 871 | 875 | |
| 872 | 876 | /** |
| 873 | 877 | * Usage discussion: |
| … |
… |
|
| 3900 | 3904 | /** El-Torito image is hidden (WARNING,HIGH, -335) */ |
| 3901 | 3905 | #define ISO_EL_TORITO_HIDDEN 0xD030FEB1 |
| 3902 | 3906 | |
| | 3907 | /** Read error occured with IsoDataSource (SORRY,HIGH, -513) */ |
| | 3908 | #define ISO_DATA_SOURCE_SORRY 0xE030FCFF |
| | 3909 | |
| | 3910 | /** Read error occured with IsoDataSource (MISHAP,HIGH, -513) */ |
| | 3911 | #define ISO_DATA_SOURCE_MISHAP 0xE430FCFF |
| | 3912 | |
| | 3913 | /** Read error occured with IsoDataSource (FAILURE,HIGH, -513) */ |
| | 3914 | #define ISO_DATA_SOURCE_FAILURE 0xE830FCFF |
| | 3915 | |
| | 3916 | /** Read error occured with IsoDataSource (FATAL,HIGH, -513) */ |
| | 3917 | #define ISO_DATA_SOURCE_FATAL 0xF030FCFF |
| | 3918 | |
| 3903 | 3919 | #endif /*LIBISO_LIBISOFS_H_*/ |
=== modified file 'libisofs/messages.c'
|
|
|
|
| 204 | 204 | return "Image write cancelled"; |
| 205 | 205 | case ISO_EL_TORITO_HIDDEN: |
| 206 | 206 | return "El-Torito image is hidden"; |
| | 207 | case ISO_DATA_SOURCE_SORRY: |
| | 208 | case ISO_DATA_SOURCE_MISHAP: |
| | 209 | case ISO_DATA_SOURCE_FAILURE: |
| | 210 | case ISO_DATA_SOURCE_FATAL: |
| | 211 | return "Read error occured with IsoDataSource"; |
| 207 | 212 | default: |
| 208 | 213 | return "Unknown error"; |
| 209 | 214 | } |
