From: Lukáš Lalinský <lalinsky@gmail.com>
Date: Sat, 28 May 2011 20:04:07 +0000 (+0200)
Subject: Merge remote branch 'taglib/master' into abstract-io
X-Git-Tag: v1.8beta~108^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=088dbfa8320dc7f87b120f93b88a8f24b716822c;p=taglib

Merge remote branch 'taglib/master' into abstract-io
---

088dbfa8320dc7f87b120f93b88a8f24b716822c
diff --cc taglib/toolkit/tfile.cpp
index c0afd403,93879f10..bb0261ea
--- a/taglib/toolkit/tfile.cpp
+++ b/taglib/toolkit/tfile.cpp
@@@ -314,12 -550,18 +314,13 @@@ bool File::isWritable(const char *file
  // protected members
  ////////////////////////////////////////////////////////////////////////////////
  
 -void File::setValid(bool valid)
 -{
 -  d->valid = valid;
 -}
 -
 -void File::truncate(long length)
 +TagLib::uint File::bufferSize()
  {
 -  ftruncate(fileno(d->file), length);
 +  return FilePrivate::bufferSize;
  }
  
 -TagLib::uint File::bufferSize()
 +void File::setValid(bool valid)
  {
 -  return FilePrivate::bufferSize;
 +  d->valid = valid;
  }
+