Hello community, here is the log from the commit of package libsmraw for openSUSE:Factory checked in at 2014-09-28 19:54:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsmraw (Old) and /work/SRC/openSUSE:Factory/.libsmraw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsmraw" Changes: -------- --- /work/SRC/openSUSE:Factory/libsmraw/libsmraw.changes 2014-08-25 11:05:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsmraw.new/libsmraw.changes 2014-09-28 19:54:25.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Sep 19 18:20:20 UTC 2014 - greg.freem...@gmail.com + +- update to 20140817 + * Worked on smrawmount +- updated Source: field to have fullpath; removed DL_URL field + +------------------------------------------------------------------- Old: ---- libsmraw-alpha-20140728.tar.gz New: ---- libsmraw-alpha-20140817.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsmraw.spec ++++++ --- /var/tmp/diff_new_pack.aNMusc/_old 2014-09-28 19:54:26.000000000 +0200 +++ /var/tmp/diff_new_pack.aNMusc/_new 2014-09-28 19:54:26.000000000 +0200 @@ -18,7 +18,7 @@ Name: libsmraw %define lname libsmraw1 -%define timestamp 20140728 +%define timestamp 20140817 Version: 0~%timestamp Release: 0 Summary: Library and tools to access the (split) RAW image format @@ -27,8 +27,7 @@ Url: http://code.google.com/p/libsmraw/ #Git-Clone: http://code.google.com/p/libsmraw -#DL-URL: https://googledrive.com/host/0B3fBvzttpiiSRml2cndCelp2R3M/libsmraw-alpha-20140728.tar.gz -Source: %name-alpha-%timestamp.tar.gz +Source: https://googledrive.com/host/0B3fBvzttpiiSRml2cndCelp2R3M/libsmraw-alpha-20140817.tar.gz BuildRequires: pkg-config BuildRequires: python-devel BuildRequires: pkgconfig(fuse) >= 2.6 ++++++ libsmraw-alpha-20140728.tar.gz -> libsmraw-alpha-20140817.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/ChangeLog new/libsmraw-20140817/ChangeLog --- old/libsmraw-20140728/ChangeLog 2014-07-28 08:32:20.000000000 +0200 +++ new/libsmraw-20140817/ChangeLog 2014-08-17 11:32:31.000000000 +0200 @@ -28,6 +28,12 @@ * make sure certain values cannot be changed if writing/reading from raw files * add glob test to msvscpp project +20140817 +* updated msvscpp files - fixes for smraw.net + +20140801 +* Worked on smrawmount + 20140728 * updated dependencies * fixes for FreeBSD 8 compilation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/common/config.h new/libsmraw-20140817/common/config.h --- old/libsmraw-20140728/common/config.h 2014-07-28 17:16:52.000000000 +0200 +++ new/libsmraw-20140817/common/config.h 2014-08-17 11:33:06.000000000 +0200 @@ -618,7 +618,7 @@ #define PACKAGE_NAME "libsmraw" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libsmraw 20140728" +#define PACKAGE_STRING "libsmraw 20140817" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libsmraw" @@ -627,7 +627,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "20140728" +#define PACKAGE_VERSION "20140817" /* The size of `off_t', as computed by sizeof. */ #define SIZEOF_OFF_T 8 @@ -651,7 +651,7 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "20140728" +#define VERSION "20140817" /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/configure new/libsmraw-20140817/configure --- old/libsmraw-20140728/configure 2014-07-28 19:56:35.000000000 +0200 +++ new/libsmraw-20140817/configure 2014-08-17 11:38:16.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libsmraw 20140728. +# Generated by GNU Autoconf 2.69 for libsmraw 20140817. # # Report bugs to <joachim.m...@gmail.com>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libsmraw' PACKAGE_TARNAME='libsmraw' -PACKAGE_VERSION='20140728' -PACKAGE_STRING='libsmraw 20140728' +PACKAGE_VERSION='20140817' +PACKAGE_STRING='libsmraw 20140817' PACKAGE_BUGREPORT='joachim.m...@gmail.com' PACKAGE_URL='' @@ -1632,7 +1632,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libsmraw 20140728 to adapt to many kinds of systems. +\`configure' configures libsmraw 20140817 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1702,7 +1702,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libsmraw 20140728:";; + short | recursive ) echo "Configuration of libsmraw 20140817:";; esac cat <<\_ACEOF @@ -1960,7 +1960,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libsmraw configure 20140728 +libsmraw configure 20140817 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2612,7 +2612,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libsmraw $as_me 20140728, which was +It was created by libsmraw $as_me 20140817, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3440,7 +3440,7 @@ # Define the identity of the package. PACKAGE='libsmraw' - VERSION='20140728' + VERSION='20140817' cat >>confdefs.h <<_ACEOF @@ -45250,7 +45250,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libsmraw $as_me 20140728, which was +This file was extended by libsmraw $as_me 20140817, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -45316,7 +45316,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libsmraw config.status 20140728 +libsmraw config.status 20140817 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/configure.ac new/libsmraw-20140817/configure.ac --- old/libsmraw-20140728/configure.ac 2014-07-28 08:00:48.000000000 +0200 +++ new/libsmraw-20140817/configure.ac 2014-08-17 11:31:45.000000000 +0200 @@ -2,7 +2,7 @@ AC_INIT( [libsmraw], - [20140728], + [20140817], [joachim.m...@gmail.com]) AC_CONFIG_SRCDIR( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/dpkg/changelog new/libsmraw-20140817/dpkg/changelog --- old/libsmraw-20140728/dpkg/changelog 2014-07-28 19:56:50.000000000 +0200 +++ new/libsmraw-20140817/dpkg/changelog 2014-08-17 11:38:34.000000000 +0200 @@ -1,5 +1,5 @@ -libsmraw (20140728-1) unstable; urgency=low +libsmraw (20140817-1) unstable; urgency=low * Auto-generated - -- Joachim Metz <joachim.m...@gmail.com> Mon, 28 Jul 2014 19:56:49 +0200 + -- Joachim Metz <joachim.m...@gmail.com> Sun, 17 Aug 2014 11:38:33 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/dpkg/copyright new/libsmraw-20140817/dpkg/copyright --- old/libsmraw-20140728/dpkg/copyright 2014-07-28 19:56:50.000000000 +0200 +++ new/libsmraw-20140817/dpkg/copyright 2014-08-17 11:38:34.000000000 +0200 @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Joachim Metz <joachim.m...@gmail.com> on Mon, 28 Jul 2014 19:56:49 +0200 + Joachim Metz <joachim.m...@gmail.com> on Sun, 17 Aug 2014 11:38:33 +0200 It was downloaded from http://code.google.com/p/libsmraw/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/include/libsmraw/definitions.h new/libsmraw-20140817/include/libsmraw/definitions.h --- old/libsmraw-20140728/include/libsmraw/definitions.h 2014-07-28 19:56:50.000000000 +0200 +++ new/libsmraw-20140817/include/libsmraw/definitions.h 2014-08-17 11:38:34.000000000 +0200 @@ -24,11 +24,11 @@ #include <libsmraw/types.h> -#define LIBSMRAW_VERSION 20140728 +#define LIBSMRAW_VERSION 20140817 /* The version string */ -#define LIBSMRAW_VERSION_STRING "20140728" +#define LIBSMRAW_VERSION_STRING "20140817" /* The access flags definitions * bit 1 set to 1 for read access diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/libsmraw/libsmraw.rc new/libsmraw-20140817/libsmraw/libsmraw.rc --- old/libsmraw-20140728/libsmraw/libsmraw.rc 2014-07-28 19:56:51.000000000 +0200 +++ new/libsmraw-20140817/libsmraw/libsmraw.rc 2014-08-17 11:38:34.000000000 +0200 @@ -22,12 +22,12 @@ BLOCK "040904E4" BEGIN VALUE "FileDescription", "Library to access the storage media (SM) (split) RAW format\0" - VALUE "FileVersion", "20140728" "\0" + VALUE "FileVersion", "20140817" "\0" VALUE "InternalName", "libsmraw.dll\0" VALUE "LegalCopyright", "(c) 2010-2014, Joachim Metz <joachim.m...@gmail.com>\0" VALUE "OriginalFilename", "libsmraw.dll\0" VALUE "ProductName", "libsmraw\0" - VALUE "ProductVersion", "20140728" "\0" + VALUE "ProductVersion", "20140817" "\0" VALUE "Comments", "For more information visit http://code.google.com/p/libsmraw/\0"; END END diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/libsmraw/libsmraw_definitions.h new/libsmraw-20140817/libsmraw/libsmraw_definitions.h --- old/libsmraw-20140728/libsmraw/libsmraw_definitions.h 2014-07-28 19:56:50.000000000 +0200 +++ new/libsmraw-20140817/libsmraw/libsmraw_definitions.h 2014-08-17 11:38:34.000000000 +0200 @@ -35,11 +35,11 @@ #else -#define LIBSMRAW_VERSION 20140728 +#define LIBSMRAW_VERSION 20140817 /* The version string */ -#define LIBSMRAW_VERSION_STRING "20140728" +#define LIBSMRAW_VERSION_STRING "20140817" /* The access flags definitions * bit 1 set to 1 for read access diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/libsmraw.spec new/libsmraw-20140817/libsmraw.spec --- old/libsmraw-20140728/libsmraw.spec 2014-07-28 19:56:51.000000000 +0200 +++ new/libsmraw-20140817/libsmraw.spec 2014-08-17 11:38:34.000000000 +0200 @@ -1,5 +1,5 @@ Name: libsmraw -Version: 20140728 +Version: 20140817 Release: 1 Summary: Library to access the storage media (SM) (split) RAW format Group: System Environment/Libraries @@ -89,6 +89,6 @@ %{_libdir}/python*/site-packages/*.so %changelog -* Mon Jul 28 2014 Joachim Metz <joachim.m...@gmail.com> 20140728-1 +* Sun Aug 17 2014 Joachim Metz <joachim.m...@gmail.com> 20140817-1 - Auto-generated diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/msvscpp/libbfio/libbfio.vcproj new/libsmraw-20140817/msvscpp/libbfio/libbfio.vcproj --- old/libsmraw-20140728/msvscpp/libbfio/libbfio.vcproj 2014-07-28 17:53:11.000000000 +0200 +++ new/libsmraw-20140817/msvscpp/libbfio/libbfio.vcproj 2014-08-17 11:31:47.000000000 +0200 @@ -39,8 +39,8 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\include;..\..\common;..\..\libcstring;..\..\libcerror;..\..\libcthreads;..\..\libcdata;..\..\libclocale;..\..\libcnotify;..\..\libuna;..\..\libcfile;..\..\libcpath" - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;HAVE_LOCAL_LIBCSTRING;HAVE_LOCAL_LIBCERROR;HAVE_LOCAL_LIBCTHREADS;HAVE_LOCAL_LIBCDATA;HAVE_LOCAL_LIBCLOCALE;HAVE_LOCAL_LIBCNOTIFY;HAVE_LOCAL_LIBUNA;HAVE_LOCAL_LIBCFILE;HAVE_LOCAL_LIBCPATH;HAVE_LOCAL_LIBBFIO" + AdditionalIncludeDirectories="..\..\include;..\..\common;..\..\libcstring;..\..\libcerror;..\..\libcthreads;..\..\libcdata;..\..\libclocale;..\..\libcsplit;..\..\libuna;..\..\libcfile;..\..\libcpath" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;HAVE_LOCAL_LIBCSTRING;HAVE_LOCAL_LIBCERROR;HAVE_LOCAL_LIBCTHREADS;HAVE_LOCAL_LIBCDATA;HAVE_LOCAL_LIBCLOCALE;HAVE_LOCAL_LIBCSPLIT;HAVE_LOCAL_LIBUNA;HAVE_LOCAL_LIBCFILE;HAVE_LOCAL_LIBCPATH;HAVE_LOCAL_LIBBFIO" RuntimeLibrary="2" WarningLevel="4" CompileAs="1" @@ -101,8 +101,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\include;..\..\common;..\..\libcstring;..\..\libcerror;..\..\libcthreads;..\..\libcdata;..\..\libclocale;..\..\libcnotify;..\..\libuna;..\..\libcfile;..\..\libcpath" - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;HAVE_LOCAL_LIBCSTRING;HAVE_LOCAL_LIBCERROR;HAVE_LOCAL_LIBCTHREADS;HAVE_LOCAL_LIBCDATA;HAVE_LOCAL_LIBCLOCALE;HAVE_LOCAL_LIBCNOTIFY;HAVE_LOCAL_LIBUNA;HAVE_LOCAL_LIBCFILE;HAVE_LOCAL_LIBCPATH;HAVE_LOCAL_LIBBFIO" + AdditionalIncludeDirectories="..\..\include;..\..\common;..\..\libcstring;..\..\libcerror;..\..\libcthreads;..\..\libcdata;..\..\libclocale;..\..\libcsplit;..\..\libuna;..\..\libcfile;..\..\libcpath" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;HAVE_LOCAL_LIBCSTRING;HAVE_LOCAL_LIBCERROR;HAVE_LOCAL_LIBCTHREADS;HAVE_LOCAL_LIBCDATA;HAVE_LOCAL_LIBCLOCALE;HAVE_LOCAL_LIBCSPLIT;HAVE_LOCAL_LIBUNA;HAVE_LOCAL_LIBCFILE;HAVE_LOCAL_LIBCPATH;HAVE_LOCAL_LIBBFIO" BasicRuntimeChecks="3" SmallerTypeCheck="true" RuntimeLibrary="3" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/msvscpp/libsmraw.sln new/libsmraw-20140817/msvscpp/libsmraw.sln --- old/libsmraw-20140728/msvscpp/libsmraw.sln 2014-07-28 17:53:11.000000000 +0200 +++ new/libsmraw-20140817/msvscpp/libsmraw.sln 2014-08-17 11:31:47.000000000 +0200 @@ -104,13 +104,16 @@ {8AFAA2C6-E025-4B45-B96F-A27D04C6115A} = {8AFAA2C6-E025-4B45-B96F-A27D04C6115A} {B9332DC8-7594-47DF-80C1-38922E0F4DFB} = {B9332DC8-7594-47DF-80C1-38922E0F4DFB} {CEDF8919-00B2-4D8A-88CC-84ADB2D2FF89} = {CEDF8919-00B2-4D8A-88CC-84ADB2D2FF89} - {5304AD69-D449-4589-B2C9-E4607E56A51D} = {5304AD69-D449-4589-B2C9-E4607E56A51D} + {B86FB73A-4ACC-42DE-9545-586D93955B06} = {B86FB73A-4ACC-42DE-9545-586D93955B06} {BC27FF34-C859-4A1A-95D6-FC89952E1910} = {BC27FF34-C859-4A1A-95D6-FC89952E1910} {4C93BDD3-1804-47F3-9B34-F2DE0CAE1AE0} = {4C93BDD3-1804-47F3-9B34-F2DE0CAE1AE0} {3FFB9C05-1145-45A7-9ADE-5C8D70FBD7CA} = {3FFB9C05-1145-45A7-9ADE-5C8D70FBD7CA} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "smraw.net", "smraw.net\smraw.net.vcproj", "{F4E520F8-316A-429E-963D-90D8A88DD33C}" + ProjectSection(ProjectDependencies) = postProject + {8836FD13-C36B-47D3-A9DF-BB994FFA6039} = {8836FD13-C36B-47D3-A9DF-BB994FFA6039} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcfile", "libcfile\libcfile.vcproj", "{4C93BDD3-1804-47F3-9B34-F2DE0CAE1AE0}" ProjectSection(ProjectDependencies) = postProject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/pysmraw/setup.py new/libsmraw-20140817/pysmraw/setup.py --- old/libsmraw-20140728/pysmraw/setup.py 2014-07-28 19:56:51.000000000 +0200 +++ new/libsmraw-20140817/pysmraw/setup.py 2014-08-17 11:38:34.000000000 +0200 @@ -26,10 +26,10 @@ LIBRARY_NAME = "libsmraw" -LIBRARY_VERSION = "20140728" +LIBRARY_VERSION = "20140817" MODULE_NAME = "py%s" % (LIBRARY_NAME[3:]) # bdist_msi does not support the library version, neither a date as a version. -MODULE_VERSION = "20140728.1" +MODULE_VERSION = "20140817.1" PROJECT_URL = "http://code.google.com/p/%s/"; % (LIBRARY_NAME) DIRECTORY_NAMES = [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/smrawtools/mount_handle.c new/libsmraw-20140817/smrawtools/mount_handle.c --- old/libsmraw-20140728/smrawtools/mount_handle.c 2014-07-28 19:15:50.000000000 +0200 +++ new/libsmraw-20140817/smrawtools/mount_handle.c 2014-08-01 13:02:03.000000000 +0200 @@ -464,15 +464,15 @@ return( offset ); } -/* Retrieves the media size of the input handle +/* Retrieves the number of input handles * Returns 1 if successful or -1 on error */ -int mount_handle_get_media_size( +int mount_handle_get_number_of_input_handles( mount_handle_t *mount_handle, - size64_t *size, + int *number_of_input_handles, libcerror_error_t **error ) { - static char *function = "mount_handle_get_media_size"; + static char *function = "mount_handle_get_number_of_input_handles"; if( mount_handle == NULL ) { @@ -485,32 +485,31 @@ return( -1 ); } - if( libsmraw_handle_get_media_size( - mount_handle->input_handle, - size, - error ) != 1 ) + if( number_of_input_handles == NULL ) { libcerror_error_set( error, - LIBCERROR_ERROR_DOMAIN_RUNTIME, - LIBCERROR_RUNTIME_ERROR_GET_FAILED, - "%s: unable to retrieve media size from input handle.", + LIBCERROR_ERROR_DOMAIN_ARGUMENTS, + LIBCERROR_ARGUMENT_ERROR_INVALID_VALUE, + "%s: invalid number of input handles.", function ); return( -1 ); } + *number_of_input_handles = 1; + return( 1 ); } -/* Retrieves the number of input handles +/* Retrieves the size of the input volume * Returns 1 if successful or -1 on error */ -int mount_handle_get_number_of_input_handles( +int mount_handle_get_size( mount_handle_t *mount_handle, - int *number_of_input_handles, + size64_t *size, libcerror_error_t **error ) { - static char *function = "mount_handle_get_number_of_input_handles"; + static char *function = "mount_handle_get_size"; if( mount_handle == NULL ) { @@ -523,19 +522,20 @@ return( -1 ); } - if( number_of_input_handles == NULL ) + if( libsmraw_handle_get_media_size( + mount_handle->input_handle, + size, + error ) != 1 ) { libcerror_error_set( error, - LIBCERROR_ERROR_DOMAIN_ARGUMENTS, - LIBCERROR_ARGUMENT_ERROR_INVALID_VALUE, - "%s: invalid number of input handles.", + LIBCERROR_ERROR_DOMAIN_RUNTIME, + LIBCERROR_RUNTIME_ERROR_GET_FAILED, + "%s: unable to retrieve size from input handle.", function ); return( -1 ); } - *number_of_input_handles = 1; - return( 1 ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/smrawtools/mount_handle.h new/libsmraw-20140817/smrawtools/mount_handle.h --- old/libsmraw-20140728/smrawtools/mount_handle.h 2014-07-28 19:15:50.000000000 +0200 +++ new/libsmraw-20140817/smrawtools/mount_handle.h 2014-08-01 13:00:52.000000000 +0200 @@ -81,14 +81,14 @@ int whence, libcerror_error_t **error ); -int mount_handle_get_media_size( +int mount_handle_get_number_of_input_handles( mount_handle_t *mount_handle, - size64_t *size, + int *number_of_input_handles, libcerror_error_t **error ); -int mount_handle_get_number_of_input_handles( +int mount_handle_get_size( mount_handle_t *mount_handle, - int *number_of_input_handles, + size64_t *size, libcerror_error_t **error ); #if defined( __cplusplus ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsmraw-20140728/smrawtools/smrawmount.c new/libsmraw-20140817/smrawtools/smrawmount.c --- old/libsmraw-20140728/smrawtools/smrawmount.c 2014-07-28 19:55:26.000000000 +0200 +++ new/libsmraw-20140817/smrawtools/smrawmount.c 2014-08-01 13:05:17.000000000 +0200 @@ -478,7 +478,7 @@ char *name, size_t name_size, struct stat *stat_info, - libsmraw_handle_t *handle, + mount_handle_t *mount_handle, uint8_t use_mount_time, libcerror_error_t **error ) { @@ -497,14 +497,14 @@ return( -1 ); } - if( handle == NULL ) + if( mount_handle == NULL ) { number_of_sub_items = 1; } else { - if( libsmraw_handle_get_media_size( - handle, + if( mount_handle_get_size( + mount_handle, &media_size, error ) != 1 ) { @@ -566,7 +566,6 @@ return( 1 ); } - /* Reads a directory * Returns 0 if successful or a negative errno value otherwise */ @@ -763,7 +762,7 @@ &( smrawmount_fuse_path[ 1 ] ), string_index - 1, stat_info, - smrawmount_mount_handle->input_handle, + smrawmount_mount_handle, 1, &error ) != 1 ) { @@ -782,8 +781,6 @@ memory_free( stat_info ); - stat_info = NULL; - return( 0 ); on_error: @@ -911,8 +908,8 @@ goto on_error; } /* TODO add support for multiple input handles ? */ - if( libsmraw_handle_get_media_size( - smrawmount_mount_handle->input_handle, + if( mount_handle_get_size( + smrawmount_mount_handle, &media_size, &error ) != 1 ) { @@ -1469,7 +1466,7 @@ wchar_t *name, size_t name_size, WIN32_FIND_DATAW *find_data, - libsmraw_handle_t *handle, + mount_handle_t *mount_handle, uint8_t use_mount_time, libcerror_error_t **error ) { @@ -1510,14 +1507,14 @@ return( -1 ); } - if( handle == NULL ) + if( mount_handle == NULL ) { number_of_sub_items = 1; } else { - if( libsmraw_handle_get_media_size( - handle, + if( mount_handle_get_size( + mount_handle, &media_size, error ) != 1 ) { @@ -1973,8 +1970,8 @@ goto on_error; } /* TODO add support for multiple input handles ? */ - if( libsmraw_handle_get_media_size( - smrawmount_mount_handle->input_handle, + if( mount_handle_get_size( + smrawmount_mount_handle, &media_size, &error ) != 1 ) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
