From kde-commits Tue Jul 31 22:52:26 2007 From: Henrique Pinto Date: Tue, 31 Jul 2007 22:52:26 +0000 To: kde-commits Subject: KDE/kdeutils/ark/plugins/bk Message-Id: <1185922346.507078.16261.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=118592236018633 SVN commit 694865 by henrique: * Fix more Krazy issues * No need to have 'extern "C" { }' for bk.h now M +3 -0 bkAdd.h M +3 -0 bkCache.h M +3 -0 bkError.h M +3 -0 bkExtract.h M +3 -0 bkGet.h M +3 -0 bkLink.h M +3 -0 bkMangle.h M +3 -0 bkMisc.h M +3 -0 bkRead.h M +3 -0 bkRead7x.h M +3 -0 bkSet.h M +3 -0 bkSort.h M +3 -0 bkTime.h M +3 -0 bkWrite7x.h M +0 -3 bkplugin.h --- trunk/KDE/kdeutils/ark/plugins/bk/bkAdd.h #694864:694865 @@ -1,3 +1,6 @@ +#ifndef BKADD_H +#define BKADD_H int add(VolInfo* volInfo, const char* srcPathAndName, BkDir* destDir, const char* nameToUse); int addDirContents(VolInfo* volInfo, const char* srcPath, BkDir* destDir); +#endif --- trunk/KDE/kdeutils/ark/plugins/bk/bkCache.h #694864:694865 @@ -1,3 +1,5 @@ +#ifndef BKCACHE_H +#define BKCACHE_H int wcSeekForward(VolInfo* volInfo, off_t numBytes); int wcSeekSet(VolInfo* volInfo, off_t position); off_t wcSeekTell(VolInfo* volInfo); @@ -2 +4,2 @@ int wcWrite(VolInfo* volInfo, const char* block, off_t numBytes); +#endif --- trunk/KDE/kdeutils/ark/plugins/bk/bkError.h #694864:694865 @@ -1,3 +1,5 @@ +#ifndef BKERROR_H +#define BKERROR_H /****************************************************************************** * errnum.h * this file contains #defined ints for return codes (errors and warnings) @@ -123,3 +125,4 @@ /* do not make up #defines with numbers lower then this */ #define BKERROR_END -1000000 #define BKERROR_END_TEXT "Double oops, unusable error number used" +#endif --- trunk/KDE/kdeutils/ark/plugins/bk/bkExtract.h #694864:694865 @@ -1,3 +1,5 @@ +#ifndef BKEXTRACT_H +#define BKEXTRACT_H int copyByteBlock(VolInfo* volInfo, int src, int dest, unsigned numBytes); int extract(VolInfo* volInfo, BkDir* parentDir, char* nameToExtract, const char* destDir, const char* nameToUse, bool keepPermissions); @@ -7,3 +9,4 @@ const char* nameToUse, bool keepPermissions); int extractSymlink(BkSymLink* srcLink, const char* destDir, const char* nameToUse); +#endif --- trunk/KDE/kdeutils/ark/plugins/bk/bkGet.h #694864:694865 @@ -1,3 +1,6 @@ +#ifndef BKGET_H +#define BKGET_H off_t estimateIsoSize(const BkDir* tree, int filenameTypes); int getDirFromString(const BkDir* tree, const char* pathStr, BkDir** dirFoundPtr); +#endif --- trunk/KDE/kdeutils/ark/plugins/bk/bkLink.h #694864:694865 @@ -1,3 +1,5 @@ +#ifndef BKLINK_H +#define BKLINK_H int addToHardLinkTable(VolInfo* volInfo, off_t position, char* pathAndName, unsigned size, bool onImage, BkHardLink** newLink); int filesAreSame(VolInfo* volInfo, int file1, off_t posFile1, @@ -8,3 +10,4 @@ int readFileHead(VolInfo* volInfo, off_t position, char* pathAndName, bool onImage, unsigned char* dest, int numBytes); void resetWriteStatus(BkHardLink* fileLocations); +#endif --- trunk/KDE/kdeutils/ark/plugins/bk/bkMangle.h #694864:694865 @@ -1,3 +1,5 @@ +#ifndef BKMANGLE_H +#define BKMANGLE_H bool charIsValid9660(char theChar); bool charIsValidJoliet(char theChar); unsigned hashString(const char *str, unsigned int length); @@ -5,3 +7,4 @@ void mangleNameFor9660(const char* origName, char* newName, bool isADir); void mangleNameForJoliet(const char* origName, char* newName, bool appendHash); void shortenNameFor9660(const char* origName, char* newName); +#endif --- trunk/KDE/kdeutils/ark/plugins/bk/bkMisc.h #694864:694865 @@ -1 +1,4 @@ +#ifndef BKMISC_H +#define BKMISC_H void maybeUpdateProgress(VolInfo* volInfo); +#endif --- trunk/KDE/kdeutils/ark/plugins/bk/bkRead.h #694864:694865 @@ -1,3 +1,5 @@ +#ifndef BKREAD_H +#define BKREAD_H int appendStringIfHaveRoom(char* dest, const char* src, int destMaxLen, int destCharsAlreadyUsed, int maxSrcLen); bool dirDrFollows(int image); @@ -17,3 +19,4 @@ void removeCrapFromFilename(char* filename, int length); int skipDR(int image); void stripSpacesFromEndOfString(char* str); +#endif --- trunk/KDE/kdeutils/ark/plugins/bk/bkRead7x.h #694864:694865 @@ -1,3 +1,5 @@ +#ifndef BKREAD7X_H +#define BKREAD7X_H /******************************************************************************* * bkRead7x * functions to read simple variables as described in sections 7.x of iso9660 @@ -13,3 +15,4 @@ int read731(int image, unsigned* value); int read733(int image, unsigned* value); void read733FromCharArray(unsigned char* array, unsigned* value); +#endif --- trunk/KDE/kdeutils/ark/plugins/bk/bkSet.h #694864:694865 @@ -1 +1,4 @@ +#ifndef BKSET_H +#define BKSET_H bool itemIsInDir(const char* name, const BkDir* dir); +#endif --- trunk/KDE/kdeutils/ark/plugins/bk/bkSort.h #694864:694865 @@ -1,2 +1,5 @@ +#ifndef BKSORT_H +#define BKSORT_H bool rightIsBigger(char* leftStr, char* rightStr); void sortDir(DirToWrite* dir, int filenameType); +#endif --- trunk/KDE/kdeutils/ark/plugins/bk/bkTime.h #694864:694865 @@ -1,3 +1,6 @@ +#ifndef BKTIME_H +#define BKTIME_H void epochToLongString(time_t epoch, char* longString); void epochToShortString(time_t epoch, char* shortString); void longStringToEpoch(const char* longString, time_t* epoch); +#endif --- trunk/KDE/kdeutils/ark/plugins/bk/bkWrite7x.h #694864:694865 @@ -1,3 +1,5 @@ +#ifndef BKWRITE7X_H +#define BKWRITE7X_H /******************************************************************************* * bkWrite7x * functions to write simple variables as described in sections 7.x of iso9660 @@ -15,3 +17,4 @@ int write732(VolInfo* volInfo, unsigned value); int write733(VolInfo* volInfo, unsigned value); void write733ToByteArray(unsigned char* dest, unsigned value); +#endif --- trunk/KDE/kdeutils/ark/plugins/bk/bkplugin.h #694864:694865 @@ -22,10 +22,7 @@ #define BKPLUGIN_H #include "kerfuffle/archiveinterface.h" -extern "C" -{ #include "bk.h" -} using namespace Kerfuffle;