[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-pim
Subject: Re: [Kde-pim]
From: Giovanni Venturi <gventuri73 () tiscali ! it>
Date: 2008-01-25 13:21:03
Message-ID: 200801251421.09080.gventuri73 () tiscali ! it
[Download RAW message or body]
[Attachment #2 (multipart/signed)]
[Attachment #4 (multipart/mixed)]
Alle giovedì 24 gennaio 2008, Jarosław Staniek ha scritto:
> try
> devel@pavilion:~/kde4-sources/trunk/kdepim> grep -r -n "KDE_fseek" *
>
> I mean the commit to kdepim/kmail/. So please change KDE_fseek .. fseek
> locally before I commit to kmail later.
> KDElibs changes have to wait a bit.
Ok. I attached the patch. Can I commit?
Giovanni
--
A KDE Italian translator and KSniffer core developer
Slackware GNU/Linux current version - kernel 2.6.24
KDE Italia - http://www.kde-it.org/
KSniffer Project - http://www.ksniffer.org/
["kdepim.patch" (text/x-diff)]
Index: kmail/kmheaders.cpp
===================================================================
--- kmail/kmheaders.cpp (revisione 766160)
+++ kmail/kmheaders.cpp (copia locale)
@@ -2712,10 +2712,10 @@
if ( update_discover ) {
//update the discovered change count
qint32 discovered_count = 0;
- KDE_fseek( sortStream, KMAIL_MAGIC_HEADER_OFFSET + 20, SEEK_SET );
+ fseek( sortStream, KMAIL_MAGIC_HEADER_OFFSET + 20, SEEK_SET );
fread( &discovered_count, sizeof(discovered_count), 1, sortStream );
discovered_count++;
- KDE_fseek( sortStream, KMAIL_MAGIC_HEADER_OFFSET + 20, SEEK_SET );
+ fseek( sortStream, KMAIL_MAGIC_HEADER_OFFSET + 20, SEEK_SET );
fwrite( &discovered_count, sizeof(discovered_count), 1, sortStream );
}
}
@@ -2829,7 +2829,7 @@
}
//magic header twice, case they've changed
- KDE_fseek(sortStream, KMAIL_MAGIC_HEADER_OFFSET, SEEK_SET);
+ fseek(sortStream, KMAIL_MAGIC_HEADER_OFFSET, SEEK_SET);
fwrite(&byteOrder, sizeof(byteOrder), 1, sortStream);
fwrite(&column, sizeof(column), 1, sortStream);
fwrite(&ascending, sizeof(ascending), 1, sortStream);
@@ -2872,9 +2872,9 @@
//update the appended flag FIXME obsolete?
qint32 appended = 1;
- KDE_fseek(sortStream, KMAIL_MAGIC_HEADER_OFFSET + 16, SEEK_SET);
+ fseek(sortStream, KMAIL_MAGIC_HEADER_OFFSET + 16, SEEK_SET);
fwrite(&appended, sizeof(appended), 1, sortStream);
- KDE_fseek(sortStream, KMAIL_MAGIC_HEADER_OFFSET + 16, SEEK_SET);
+ fseek(sortStream, KMAIL_MAGIC_HEADER_OFFSET + 16, SEEK_SET);
if (sortStream && ferror(sortStream)) {
fclose(sortStream);
@@ -2900,10 +2900,10 @@
bool waiting_for_parent, bool update_discover)
{
if(mSortOffset == -1) {
- KDE_fseek(sortStream, 0, SEEK_END);
- mSortOffset = KDE_ftell(sortStream);
+ fseek(sortStream, 0, SEEK_END);
+ mSortOffset = ftell(sortStream);
} else {
- KDE_fseek(sortStream, mSortOffset, SEEK_SET);
+ fseek(sortStream, mSortOffset, SEEK_SET);
}
int parent_id = -1;
@@ -3148,7 +3148,7 @@
CREATE_TIMER(parse);
START_TIMER(parse);
for(x = 0; !feof(sortStream) && !error; x++) {
- off_t offset = KDE_ftell(sortStream);
+ off_t offset = ftell(sortStream);
KMFolder *folder;
//parse
if(!fread(&serNum, sizeof(serNum), 1, sortStream) || //short read means to end
@@ -3440,7 +3440,7 @@
} else {
//update the appended flag
appended = 0;
- KDE_fseek(sortStream, KMAIL_MAGIC_HEADER_OFFSET + 16, SEEK_SET);
+ fseek(sortStream, KMAIL_MAGIC_HEADER_OFFSET + 16, SEEK_SET);
fwrite(&appended, sizeof(appended), 1, sortStream);
}
}
Index: kmail/kmmsgdict.cpp
===================================================================
--- kmail/kmmsgdict.cpp (revisione 766160)
+++ kmail/kmmsgdict.cpp (copia locale)
@@ -425,9 +425,9 @@
// quick consistency check to avoid allocating huge amount of memory
// due to reading corrupt file (#71549)
- long pos = KDE_ftell(fp); // store current position
+ long pos = ftell(fp); // store current position
fseek(fp, 0, SEEK_END);
- long fileSize = KDE_ftell(fp); // how large is the file ?
+ long fileSize = ftell(fp); // how large is the file ?
fseek(fp, pos, SEEK_SET); // back to previous position
// the file must at least contain what we try to read below
@@ -524,7 +524,7 @@
fwrite(&byteOrder, sizeof(byteOrder), 1, fp);
rentry->swapByteOrder = false;
}
- rentry->baseOffset = KDE_ftell(fp);
+ rentry->baseOffset = ftell(fp);
rentry->fp = fp;
}
@@ -557,7 +557,7 @@
rentry->sync();
- off_t eof = KDE_ftell(fp);
+ off_t eof = ftell(fp);
QString filename = getFolderIdsLocation( storage );
truncate(QFile::encodeName(filename), eof);
fclose(rentry->fp);
Index: kmail/kmfoldermaildir.cpp
===================================================================
--- kmail/kmfoldermaildir.cpp (revisione 766160)
+++ kmail/kmfoldermaildir.cpp (copia locale)
@@ -502,7 +502,7 @@
assert(mIndexStream != 0);
clearerr(mIndexStream);
fseek(mIndexStream, 0, SEEK_END);
- off_t revert = KDE_ftell(mIndexStream);
+ off_t revert = ftell(mIndexStream);
int len;
KMMsgBase * mb = &aMsg->toMsgBase();
Index: kmail/kmmsgbase.cpp
===================================================================
--- kmail/kmmsgbase.cpp (revisione 766160)
+++ kmail/kmmsgbase.cpp (copia locale)
@@ -1,3 +1,4 @@
+
// kmmsgbase.cpp
#include <config-kmail.h>
@@ -886,7 +887,7 @@
return ret;
if (g_chunk_length < mIndexLength)
g_chunk = (uchar *)realloc(g_chunk, g_chunk_length = mIndexLength);
- off_t first_off = KDE_ftell(storage()->mIndexStream);
+ off_t first_off = ftell(storage()->mIndexStream);
fseek(storage()->mIndexStream, mIndexOffset, SEEK_SET);
fread( g_chunk, mIndexLength, 1, storage()->mIndexStream);
fseek(storage()->mIndexStream, first_off, SEEK_SET);
@@ -963,7 +964,7 @@
assert(mIndexLength >= 0);
if (g_chunk_length < mIndexLength)
g_chunk = (uchar *)realloc(g_chunk, g_chunk_length = mIndexLength);
- off_t first_off = KDE_ftell(storage()->mIndexStream);
+ off_t first_off = ftell(storage()->mIndexStream);
fseek(storage()->mIndexStream, mIndexOffset, SEEK_SET);
fread( g_chunk, mIndexLength, 1, storage()->mIndexStream);
fseek(storage()->mIndexStream, first_off, SEEK_SET);
Index: kmail/kmfoldermbox.cpp
===================================================================
--- kmail/kmfoldermbox.cpp (revisione 766160)
+++ kmail/kmfoldermbox.cpp (copia locale)
@@ -643,7 +643,7 @@
while (!atEof)
{
- off_t pos = KDE_ftell(mStream);
+ off_t pos = ftell(mStream);
if (!fgets(line, MAX_LINE, mStream)) atEof = true;
if (atEof ||
@@ -651,7 +651,7 @@
regexp.indexIn(line) >= 0))
{
size = pos - offs;
- pos = KDE_ftell(mStream);
+ pos = ftell(mStream);
if (num >= 0)
{
@@ -761,7 +761,7 @@
else num--,numStatus++;
}
- offs = KDE_ftell(mStream);
+ offs = ftell(mStream);
num++;
numStatus--;
inHeader = true;
@@ -1044,12 +1044,12 @@
// Make sure the file is large enough to check for an end
// character
fseek( mStream, 0, SEEK_END );
- off_t revert = KDE_ftell( mStream );
- if ( KDE_ftell( mStream ) >= 2 ) {
+ off_t revert = ftell( mStream );
+ if ( ftell( mStream ) >= 2 ) {
// write message to folder file
fseek( mStream, -2, SEEK_END );
fread( endStr, 1, 2, mStream ); // ensure separating empty line
- if ( KDE_ftell( mStream ) > 0 && endStr[0]!='\n' ) {
+ if ( ftell( mStream ) > 0 && endStr[0]!='\n' ) {
++growth;
if ( endStr[1]!='\n' ) {
//printf ("****endStr[1]=%c\n", endStr[1]);
@@ -1067,19 +1067,19 @@
QByteArray messageSeparator( aMsg->mboxMessageSeparator() );
fwrite( messageSeparator.data(), messageSeparator.length(), 1, mStream );
- off_t offs = KDE_ftell( mStream );
+ off_t offs = ftell( mStream );
fwrite( msgText.data(), len, 1, mStream );
if ( msgText[(int)len-1] != '\n' ) {
fwrite( "\n\n", 1, 2, mStream );
}
fflush( mStream );
- size_t size = KDE_ftell( mStream ) - offs;
+ size_t size = ftell( mStream ) - offs;
error = ferror( mStream );
if ( error ) {
kDebug(5006) <<"Error: Could not add message to folder:"
<< strerror(errno);
- if ( KDE_ftell( mStream ) > revert ) {
+ if ( ftell( mStream ) > revert ) {
kDebug(5006) <<"Undoing changes";
truncate( QFile::encodeName(location()), revert );
}
@@ -1149,13 +1149,13 @@
assert( mIndexStream != 0 );
clearerr( mIndexStream );
fseek( mIndexStream, 0, SEEK_END );
- revert = KDE_ftell( mIndexStream );
+ revert = ftell( mIndexStream );
KMMsgBase * mb = &aMsg->toMsgBase();
int len;
const uchar *buffer = mb->asIndexString( len );
fwrite( &len,sizeof( len ), 1, mIndexStream );
- mb->setIndexOffset( KDE_ftell( mIndexStream ) );
+ mb->setIndexOffset( ftell( mIndexStream ) );
mb->setIndexLength( len );
if ( fwrite( buffer, len, 1, mIndexStream ) != 1 ) {
kDebug(5006) <<"Whoa!";
@@ -1170,7 +1170,7 @@
if (error) {
kWarning(5006) <<"Error: Could not add message to folder (No space left on device?)";
- if ( KDE_ftell( mIndexStream ) > revert ) {
+ if ( ftell( mIndexStream ) > revert ) {
kWarning(5006) <<"Undoing changes";
truncate( QFile::encodeName( indexLocation() ), revert );
}
Index: kmail/kmfolderindex.cpp
===================================================================
--- kmail/kmfolderindex.cpp (revisione 766160)
+++ kmail/kmfolderindex.cpp (copia locale)
@@ -161,7 +161,7 @@
fwrite(&byteOrder, sizeof(byteOrder), 1, tmpIndexStream);
fwrite(&sizeOfLong, sizeof(sizeOfLong), 1, tmpIndexStream);
- off_t nho = KDE_ftell(tmpIndexStream);
+ off_t nho = ftell(tmpIndexStream);
if ( !createEmptyIndex ) {
KMMsgBase* msgBase;
@@ -171,7 +171,7 @@
buffer = msgBase->asIndexString(len);
fwrite(&len,sizeof(len), 1, tmpIndexStream);
- off_t tmp = KDE_ftell(tmpIndexStream);
+ off_t tmp = ftell(tmpIndexStream);
msgBase->setIndexOffset(tmp);
msgBase->setIndexLength(len);
if(fwrite(buffer, len, 1, tmpIndexStream) != 1)
@@ -231,7 +231,7 @@
mUnreadMsgs = 0;
mTotalMsgs = 0;
- mHeaderOffset = KDE_ftell(mIndexStream);
+ mHeaderOffset = ftell(mIndexStream);
clearIndex();
while (!feof(mIndexStream))
@@ -244,7 +244,7 @@
if (mIndexSwapByteOrder)
len = kmail_swap_32(len);
- off_t offs = KDE_ftell(mIndexStream);
+ off_t offs = ftell(mIndexStream);
if(fseek(mIndexStream, len, SEEK_CUR))
break;
mi = new KMMsgInfo(folder(), offs, len);
@@ -355,7 +355,7 @@
if (header_length > 0xFFFF)
header_length = kmail_swap_32(header_length);
- off_t endOfHeader = KDE_ftell(mIndexStream) + header_length;
+ off_t endOfHeader = ftell(mIndexStream) + header_length;
bool needs_update = true;
// Process available header parts
["signature.asc" (application/pgp-signature)]
_______________________________________________
KDE PIM mailing list kde-pim@kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic