------------------------------------------------------------ revno: 94 fixes bug: http://bugs.debian.org/624962 committer: Dmitrijs Ledkovs <[email protected]> branch nick: debian timestamp: Tue 2011-11-08 17:57:27 +0000 message: Additional compiler error fix, thanks to "brian m. carlson" <[email protected]> (Closes: 624962) modified: debian/changelog debian/patches/12_fix_compiler_warnings.diff
-- lp:sword/debian https://code.launchpad.net/~pkgcrosswire/sword/main Your team CrossWire Packaging Team is subscribed to branch lp:sword/debian. To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/sword/main/+edit-subscription
=== modified file 'debian/changelog' --- debian/changelog 2011-11-08 17:48:26 +0000 +++ debian/changelog 2011-11-08 17:57:27 +0000 @@ -13,6 +13,8 @@ * document vs2osisreftxt.1 * 3.0 (quilt) format only (launchpad ppa supports it now) * fix gcc-4.6 warnings + * Additional compiler error fix, thanks to + "brian m. carlson" <[email protected]> (Closes: 624962) -- Dmitrijs Ledkovs <[email protected]> Tue, 30 Nov 2010 23:06:43 +0000 === modified file 'debian/patches/12_fix_compiler_warnings.diff' --- debian/patches/12_fix_compiler_warnings.diff 2010-11-30 00:30:13 +0000 +++ debian/patches/12_fix_compiler_warnings.diff 2011-11-08 17:57:27 +0000 @@ -1,7 +1,9 @@ Remove compiler warnings so SWORD will compile with -Wall -Werror ---- a/src/mgr/filemgr.cpp -+++ b/src/mgr/filemgr.cpp -@@ -408,7 +408,7 @@ +Index: debian/src/mgr/filemgr.cpp +=================================================================== +--- debian.orig/src/mgr/filemgr.cpp ++++ debian/src/mgr/filemgr.cpp +@@ -408,7 +408,7 @@ int FileMgr::createPathAndFile(const cha int FileMgr::copyFile(const char *sourceFile, const char *targetFile) { @@ -10,8 +12,10 @@ char buf[4096]; if ((sfd = ::open(sourceFile, O_RDONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH)) < 1) ---- a/src/utilfuns/zlib/untgz.c -+++ b/src/utilfuns/zlib/untgz.c +Index: debian/src/utilfuns/zlib/untgz.c +=================================================================== +--- debian.orig/src/utilfuns/zlib/untgz.c ++++ debian/src/utilfuns/zlib/untgz.c @@ -13,6 +13,8 @@ #include <fcntl.h> #ifdef unix @@ -21,7 +25,7 @@ #else # include <direct.h> # include <io.h> -@@ -80,7 +82,7 @@ +@@ -80,7 +82,7 @@ union tar_buffer { enum { TGZ_EXTRACT = 0, TGZ_LIST }; @@ -30,7 +34,7 @@ void TGZnotfound OF((const char *)); int getoct OF((char *, int)); -@@ -105,22 +107,23 @@ +@@ -105,22 +107,23 @@ static char *TGZprefix[] = { "\0", ".tgz /* Return the real name of the TGZ archive */ /* or NULL if it does not exist. */ @@ -70,7 +74,7 @@ /* error message for the filename */ -@@ -277,7 +280,7 @@ +@@ -277,7 +280,7 @@ int untar (gzFile in, const char *dest) int remaining = 0; FILE *outfile = NULL; char fname[BLOCKSIZE]; @@ -79,9 +83,11 @@ while (1) { len = gzread(in, &buffer, BLOCKSIZE); ---- a/tests/testblocks.cpp -+++ b/tests/testblocks.cpp -@@ -29,14 +29,18 @@ +Index: debian/tests/testblocks.cpp +=================================================================== +--- debian.orig/tests/testblocks.cpp ++++ debian/tests/testblocks.cpp +@@ -29,14 +29,18 @@ using namespace sword; void addEntry(EntriesBlock *eb) { string input; string body; @@ -105,7 +111,7 @@ } while (input.compare(".")); std::cout << "Adding new entry. Index is: " << eb->addEntry(body.c_str()) << "\n\n"; -@@ -72,29 +76,33 @@ +@@ -72,29 +76,33 @@ int main(int argc, char **argv) { EntriesBlock *eb = new EntriesBlock(); string input; @@ -157,9 +163,11 @@ } } } ---- a/utilities/stepdump.cpp -+++ b/utilities/stepdump.cpp -@@ -158,33 +158,56 @@ +Index: debian/utilities/stepdump.cpp +=================================================================== +--- debian.orig/utilities/stepdump.cpp ++++ debian/utilities/stepdump.cpp +@@ -158,33 +158,56 @@ int main(int argc, char **argv) { void readVersion(int fd, Version *versionRecord) { @@ -227,7 +235,7 @@ cout << "\tmodifiedBy: " << versionRecord->modifiedBy << "\n"; int skip = versionRecord->versionRecordSize - 16/*sizeof(struct Version*/; -@@ -192,33 +215,49 @@ +@@ -192,33 +215,49 @@ void readVersion(int fd, Version *versio if (skip) { cout << "\nSkipping " << skip << " unknown bytes.\n"; char *skipbuf = new char[skip]; @@ -286,7 +294,7 @@ cout << "\treserved2: " << viewableHeaderRecord->reserved2 << "\n"; int skip = viewableHeaderRecord->viewableHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/; -@@ -226,18 +265,23 @@ +@@ -226,18 +265,23 @@ void readViewableHeader(int fd, Viewable if (skip) { cout << "\nSkipping " << skip << " unknown bytes.\n"; char *skipbuf = new char[skip]; @@ -312,7 +320,7 @@ compress->zBuf(&size, *buf); strcpy(*buf, compress->Buf()); -@@ -247,30 +291,41 @@ +@@ -247,30 +291,41 @@ void readViewableBlockText(int fd, Viewa void readViewableBlock(int fd, ViewableBlock *vb) { @@ -360,9 +368,11 @@ (*buf)[headerControlWordAreaSize] = 0; cout << "headerControlWordArea:\n" << *buf << "\n"; ---- a/utilities/treeidxutil.cpp -+++ b/utilities/treeidxutil.cpp -@@ -53,27 +53,33 @@ +Index: debian/utilities/treeidxutil.cpp +=================================================================== +--- debian.orig/utilities/treeidxutil.cpp ++++ debian/utilities/treeidxutil.cpp +@@ -53,27 +53,33 @@ void printLocalName(TreeKeyIdx *treeKey) void setLocalName(TreeKeyIdx *treeKey) { @@ -402,7 +412,7 @@ treeKey->append(); treeKey->setLocalName(buf); treeKey->save(); -@@ -83,9 +89,11 @@ +@@ -83,9 +89,11 @@ void appendSibbling(TreeKeyIdx *treeKey) void appendChild(TreeKeyIdx *treeKey) { @@ -416,7 +426,7 @@ treeKey->appendChild(); treeKey->setLocalName(buf); treeKey->save(); -@@ -118,11 +126,13 @@ +@@ -118,11 +126,13 @@ int main(int argc, char **argv) { TreeKeyIdx root = *treeKey; std::string input; @@ -432,9 +442,11 @@ input = line; if (input.length() > 0) { switch (input[0]) { ---- a/utilities/gbfidx.cpp -+++ b/utilities/gbfidx.cpp -@@ -53,7 +53,7 @@ +Index: debian/utilities/gbfidx.cpp +=================================================================== +--- debian.orig/utilities/gbfidx.cpp ++++ debian/utilities/gbfidx.cpp +@@ -53,7 +53,7 @@ char testmnt; int main(int argc, char **argv) { long pos, offset; @@ -443,7 +455,7 @@ char startflag = 0; short size; -@@ -65,18 +65,30 @@ +@@ -65,18 +65,30 @@ int main(int argc, char **argv) num1 = key1.Chapter(); num2 = key1.Verse(); pos = 0; @@ -480,7 +492,7 @@ while(!findbreak(fp, &offset, &num1, &num2, &rangemax, &size)) { if (!startflag) { -@@ -120,6 +132,7 @@ +@@ -120,6 +132,7 @@ int main(int argc, char **argv) void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size) { @@ -488,7 +500,7 @@ long pos; short tmp; -@@ -127,26 +140,48 @@ +@@ -127,26 +140,48 @@ void writeidx(VerseKey &key1, VerseKey & if (key1.Verse() == 1) { // new chapter if (key1.Chapter() == 1) { // new book pos = lseek(cfp, 0, SEEK_CUR); @@ -548,9 +560,11 @@ } } } ---- a/utilities/genbookutil.cpp -+++ b/utilities/genbookutil.cpp -@@ -53,9 +53,11 @@ +Index: debian/utilities/genbookutil.cpp +=================================================================== +--- debian.orig/utilities/genbookutil.cpp ++++ debian/utilities/genbookutil.cpp +@@ -53,9 +53,11 @@ void printLocalName(TreeKeyIdx *treeKey) void setLocalName(TreeKeyIdx *treeKey) { @@ -564,7 +578,7 @@ SWBuf name = buf; treeKey->setLocalName(name.trim()); treeKey->save(); -@@ -63,18 +65,22 @@ +@@ -63,18 +65,22 @@ void setLocalName(TreeKeyIdx *treeKey) { void gotoPath(TreeKeyIdx *treeKey) { @@ -591,7 +605,7 @@ SWBuf path = buf; treeKey->assureKeyPath(path.trim()); } -@@ -91,10 +97,12 @@ +@@ -91,10 +97,12 @@ void setEntryText(RawGenBook *book) { SWBuf body; TreeKeyIdx *treeKey = (TreeKeyIdx *)(SWKey *)(*book); if (treeKey->getOffset()) { @@ -606,7 +620,7 @@ SWBuf text = buf; text.trim(); if ((text[0] == '.') && (text[1] == 0)) -@@ -111,9 +119,11 @@ +@@ -111,9 +119,11 @@ void setEntryText(RawGenBook *book) { void appendSibbling(TreeKeyIdx *treeKey) { if (treeKey->getOffset()) { @@ -620,7 +634,7 @@ SWBuf name = buf; treeKey->append(); treeKey->setLocalName(name.trim()); -@@ -124,9 +134,11 @@ +@@ -124,9 +134,11 @@ void appendSibbling(TreeKeyIdx *treeKey) void appendChild(TreeKeyIdx *treeKey) { @@ -634,7 +648,7 @@ SWBuf name = buf; treeKey->appendChild(); treeKey->setLocalName(name.trim()); -@@ -168,11 +180,13 @@ +@@ -168,11 +180,13 @@ int main(int argc, char **argv) { treeKey = (TreeKeyIdx *)(SWKey *)(*book); SWBuf input; @@ -650,9 +664,11 @@ input = line; input.trim(); if (input.length() > 0) { ---- a/utilities/vpl2mod.cpp -+++ b/utilities/vpl2mod.cpp -@@ -72,14 +72,18 @@ +Index: debian/utilities/vpl2mod.cpp +=================================================================== +--- debian.orig/utilities/vpl2mod.cpp ++++ debian/utilities/vpl2mod.cpp +@@ -72,14 +72,18 @@ char readline(int fd, char **buf) { break; } @@ -674,9 +690,11 @@ (*buf)[size] = 0; // clean up any trailing junk on buf ---- a/utilities/installmgr.cpp -+++ b/utilities/installmgr.cpp -@@ -69,8 +69,10 @@ +Index: debian/utilities/installmgr.cpp +=================================================================== +--- debian.orig/utilities/installmgr.cpp ++++ debian/utilities/installmgr.cpp +@@ -69,8 +69,10 @@ virtual bool isUserDisclaimerConfirmed() cout << "then type yes at the prompt\n\n"; cout << "enable? [no] "; @@ -689,9 +707,11 @@ confirmed = (!strcmp(prompt, "yes\n")); cout << "\n"; } ---- a/utilities/step2vpl.cpp -+++ b/utilities/step2vpl.cpp -@@ -223,93 +223,169 @@ +Index: debian/utilities/step2vpl.cpp +=================================================================== +--- debian.orig/utilities/step2vpl.cpp ++++ debian/utilities/step2vpl.cpp +@@ -223,93 +223,169 @@ int main(int argc, char **argv) { void readVersion(int fd, Version *versionRecord) { @@ -896,7 +916,7 @@ compress->zBuf(&size, *buf); strcpy(*buf, compress->Buf()); -@@ -317,35 +393,53 @@ +@@ -317,35 +393,53 @@ void readViewableBlockText(int fd, Viewa void readViewableBlock(int fd, ViewableBlock *vb) { @@ -957,7 +977,7 @@ VSyncPoint vSyncPoint; lseek(fdvsync, vSyncBooksInfo->offset, SEEK_SET); -@@ -356,9 +450,15 @@ +@@ -356,9 +450,15 @@ void displayBook(int fdbook, int fdviewa char *sectionName; char *verseText; @@ -976,7 +996,7 @@ vSyncPoint.offset = SECTIONSLEVELSTART + (vSyncPoint.offset * SECTIONSLEVELSIZE); lseek(fdsections, vSyncPoint.offset, SEEK_SET); readSectionLevelInfo(fdsections, §ionLevelInfo); -@@ -413,26 +513,50 @@ +@@ -413,26 +513,50 @@ void extractVerseText(int fdviewable, in void readSectionName(int fd, SectionLevelInfo *sli, char **name) { @@ -1038,9 +1058,11 @@ } void cleanBuf(char *buf) { ---- a/utilities/cipherraw.cpp -+++ b/utilities/cipherraw.cpp -@@ -48,7 +48,7 @@ +Index: debian/utilities/cipherraw.cpp +=================================================================== +--- debian.orig/utilities/cipherraw.cpp ++++ debian/utilities/cipherraw.cpp +@@ -48,7 +48,7 @@ int main(int argc, char **argv) { SWCipher *zobj; VerseKey key; RawVerse *rawdrv; @@ -1049,7 +1071,7 @@ long tmpoff = 0, offset, loffset = 0, lzoffset = 0; unsigned short size, lsize = 0, lzsize; char *tmpbuf; -@@ -74,10 +74,18 @@ +@@ -74,10 +74,18 @@ int main(int argc, char **argv) { delete [] tmpbuf; printf("\n"); @@ -1072,7 +1094,7 @@ key.AutoNormalize(0); key.Headings(1); -@@ -89,8 +97,13 @@ +@@ -89,8 +97,13 @@ int main(int argc, char **argv) { printf("using previous offset,size %d\n", size); offset = lseek(oxfd[key.Testament() - 1], 0, SEEK_CUR); printf("%ld %ld %d \n", offset, lzoffset, lzsize); @@ -1088,7 +1110,7 @@ } else { lsize = size; -@@ -107,13 +120,23 @@ +@@ -107,13 +120,23 @@ int main(int argc, char **argv) { offset = lseek(ofd[key.Testament() - 1], 0, SEEK_CUR); tmpoff = lseek(oxfd[key.Testament() - 1], 0, SEEK_CUR); printf("%s: (%ld) NEW offset: %ld; size: %d\n", (const char *)key, tmpoff, offset, size); @@ -1116,8 +1138,10 @@ lzsize = size; } } ---- a/utilities/lexdump.c -+++ b/utilities/lexdump.c +Index: debian/utilities/lexdump.c +=================================================================== +--- debian.orig/utilities/lexdump.c ++++ debian/utilities/lexdump.c @@ -40,7 +40,7 @@ int main(int argc, char **argv) { @@ -1127,7 +1151,7 @@ long offset; unsigned int size; char datbuf[255]; -@@ -59,11 +59,17 @@ +@@ -59,11 +59,17 @@ int main(int argc, char **argv) { offset = atoi(argv[2]) * 6; lseek(idxfd, offset, SEEK_SET); @@ -1148,3 +1172,29 @@ datbuf[40] = 0; printf("%s\n", datbuf); close(datfd); +Index: debian/src/modules/swmodule.cpp +=================================================================== +--- debian.orig/src/modules/swmodule.cpp ++++ debian/src/modules/swmodule.cpp +@@ -536,7 +536,7 @@ ListKey &SWModule::search(const char *is + } + } + listKey << *resultKey; +- listKey.GetElement()->userData = (void *)((__u32)(h->score(i)*100)); ++ listKey.GetElement()->userData = (void *)((long)(h->score(i)*100)); + } + (*percent)(98, percentUserData); + } +Index: debian/tests/ciphertest.cpp +=================================================================== +--- debian.orig/tests/ciphertest.cpp ++++ debian/tests/ciphertest.cpp +@@ -30,7 +30,7 @@ int main(int argc, char **argv) { + } + + +- int encipher = atoi(argv[2]); ++ long encipher = atoi(argv[2]); + + SWFilter *filter = new CipherFilter(argv[1]); +
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
