Hello community,
here is the log from the commit of package clicfs for openSUSE:12.1 checked in
at 2011-11-10 16:19:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1/clicfs (Old)
and /work/SRC/openSUSE:12.1/.clicfs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clicfs", Maintainer is "co...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.1/clicfs/clicfs.changes 2011-10-24
12:32:09.000000000 +0200
+++ /work/SRC/openSUSE:12.1/.clicfs.new/clicfs.changes 2011-11-10
16:19:04.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Nov 10 15:18:29 UTC 2011 - co...@suse.com
+
+- some safety catches for a bug I can no longer reproduce
+
+-------------------------------------------------------------------
New:
----
_link
clicfs.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ clicfs.spec ++++++
--- /var/tmp/diff_new_pack.6X9pw9/_old 2011-11-10 16:19:04.000000000 +0100
+++ /var/tmp/diff_new_pack.6X9pw9/_new 2011-11-10 16:19:04.000000000 +0100
@@ -24,6 +24,7 @@
Summary: Compressed Loop Image Container
Group: System/Filesystems
Source: clicfs.tar.bz2
+Patch0: clicfs.diff
BuildRequires: cmake
BuildRequires: e2fsprogs-devel
BuildRequires: fuse-devel
@@ -41,6 +42,7 @@
%prep
%setup -c %{name}
+%patch0 -p1
%build
export CFLAGS="%{optflags}"
++++++ _link ++++++
<link project="openSUSE:Factory" baserev="af01550f2a69e50899bffb3a23d1c4f6">
<patches>
<branch/>
</patches>
</link>
++++++ clicfs.diff ++++++
diff --git a/src/clicfs.c b/src/clicfs.c
index 0715633..62b385f 100644
--- a/src/clicfs.c
+++ b/src/clicfs.c
@@ -454,7 +454,7 @@ static void clic_log_access(size_t block, size_t part)
static ssize_t lastblock = -1;
#endif
- fprintf(logger, "access %ld+8 (part %ld)\n", (long)block*8, part);
+ fprintf(logger, "access %ld+8 (part %ld)\n", (long)block*8, (long)part);
#if 0
if (lastblock >= 0 && block != (size_t)(lastblock + 1))
@@ -539,7 +539,10 @@ exit:
static size_t clic_write_block(const char *buf, off_t block, off_t ioff,
size_t size)
{
- if (logger) fprintf(logger, "clic_write_block %ld block:%ld ioff:%ld
size:%ld\n", detached_allocated, block, ioff, size);
+ if (!size) return 0;
+
+ if (logger) fprintf(logger, "clic_write_block %lld block:%lld ioff:%lld
size:%lld\n",
+ (long long)detached_allocated, (long long)block, (long
long)ioff, (long long)size);
if (clic_detach(block)) {
if (logger) fprintf(logger, "clic_detach FAILED\n");
return -ENOSPC;
@@ -559,7 +562,7 @@ static int clic_write(const char *path, const char *buf,
size_t size, off_t offs
if(path[0] == '/' && strcmp(path + 1, thefile) != 0)
return -ENOENT;
- if (logger) fprintf(logger, "clic_write offset %ld - size %ld (%ld)\n",
offset, size, thefilesize);
+ if (logger) fprintf(logger, "clic_write offset %lld - size %lld (%lld)\n",
(long long)offset, (long long)size, (long long)thefilesize);
if (offset >= (off_t)thefilesize) {
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
