"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "camlibs/directory/directory.c" between
libgphoto2-2.5.26.tar.bz2 and libgphoto2-2.5.27.tar.bz2

About: libgphoto2 is a library that can be used by applications to access various digital cameras.

directory.c  (libgphoto2-2.5.26.tar.bz2):directory.c  (libgphoto2-2.5.27.tar.bz2)
skipping to change at line 45 skipping to change at line 45
#endif #endif
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
# include <sys/param.h> # include <sys/param.h>
#endif #endif
#ifdef HAVE_SYS_VFS_H #ifdef HAVE_SYS_VFS_H
# include <sys/vfs.h> # include <sys/vfs.h>
#endif #endif
#ifdef HAVE_SYS_MOUNT_H #ifdef HAVE_SYS_MOUNT_H
# include <sys/mount.h> # include <sys/mount.h>
#endif #endif
#ifdef HAVE_SYS_STATFS_H
# include <sys/statfs.h>
#endif
#include <fcntl.h> #include <fcntl.h>
/* will happen only on Win32 */ /* will happen only on Win32 */
#ifndef HAVE_LSTAT #ifndef HAVE_LSTAT
#define lstat stat #define lstat stat
#endif #endif
#ifdef HAVE_LIBEXIF #ifdef HAVE_LIBEXIF
#include <libexif/exif-data.h> #include <libexif/exif-data.h>
#endif #endif
skipping to change at line 112 skipping to change at line 109
{"mpg", GP_MIME_MPEG}, {"mpg", GP_MIME_MPEG},
{"mpeg", GP_MIME_MPEG}, {"mpeg", GP_MIME_MPEG},
{"mpe", GP_MIME_MPEG}, {"mpe", GP_MIME_MPEG},
{"ogg", GP_MIME_OGG}, {"ogg", GP_MIME_OGG},
{"mts", GP_MIME_AVCHD}, {"mts", GP_MIME_AVCHD},
{"m2ts", GP_MIME_AVCHD}, {"m2ts", GP_MIME_AVCHD},
{"pbm", "image/x-portable-bitmap"}, {"pbm", "image/x-portable-bitmap"},
{"crw", GP_MIME_CRW}, {"crw", GP_MIME_CRW},
{"rw2", GP_MIME_RW2}, {"rw2", GP_MIME_RW2},
{"cr2", GP_MIME_RAW}, {"cr2", GP_MIME_RAW},
{"cr3", GP_MIME_RAW},
{"nef", GP_MIME_RAW}, {"nef", GP_MIME_RAW},
{"mrw", GP_MIME_RAW}, {"mrw", GP_MIME_RAW},
{"dng", GP_MIME_RAW}, {"dng", GP_MIME_RAW},
{"sr2", GP_MIME_RAW}, {"sr2", GP_MIME_RAW},
{"raf", GP_MIME_RAW}, {"raf", GP_MIME_RAW},
{"erf", GP_MIME_RAW}, {"erf", GP_MIME_RAW},
{"orf", GP_MIME_RAW}, {"orf", GP_MIME_RAW},
{"arw", GP_MIME_RAW}, {"arw", GP_MIME_RAW},
{"pef", GP_MIME_RAW}, {"pef", GP_MIME_RAW},
{"raw", GP_MIME_RAW}, {"raw", GP_MIME_RAW},
skipping to change at line 746 skipping to change at line 744
static int static int
storage_info_func (CameraFilesystem *fs, storage_info_func (CameraFilesystem *fs,
CameraStorageInformation **sinfos, CameraStorageInformation **sinfos,
int *nrofsinfos, int *nrofsinfos,
void *data, GPContext *context void *data, GPContext *context
) { ) {
Camera *camera = data; Camera *camera = data;
CameraStorageInformation *sfs; CameraStorageInformation *sfs;
#if defined(linux) && defined(HAVE_STATFS) #if defined(HAVE_STATVFS)
struct statfs stfs; struct statvfs stfs;
char *xpath; char *xpath;
int ret; int ret;
ret = _get_mountpoint (camera->port, &xpath); ret = _get_mountpoint (camera->port, &xpath);
if (ret < GP_OK) if (ret < GP_OK)
return ret; return ret;
if (-1 == statfs (xpath, &stfs)) if (-1 == statvfs (xpath, &stfs))
return GP_ERROR_NOT_SUPPORTED; return GP_ERROR_NOT_SUPPORTED;
sfs = malloc (sizeof (CameraStorageInformation)); sfs = malloc (sizeof (CameraStorageInformation));
if (!sfs) if (!sfs)
return GP_ERROR_NO_MEMORY; return GP_ERROR_NO_MEMORY;
*sinfos = sfs; *sinfos = sfs;
*nrofsinfos = 1; *nrofsinfos = 1;
sfs->fields = GP_STORAGEINFO_BASE | sfs->fields = GP_STORAGEINFO_BASE |
GP_STORAGEINFO_DESCRIPTION | GP_STORAGEINFO_DESCRIPTION |
 End of changes. 4 change blocks. 
6 lines changed or deleted 4 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)