[Pkg-crosswire-devel] [Branch ~pkgcrosswire/libsword/main] Rev 54: Fix even more compiler warnings and add one more include stdio.h
noreply at launchpad.net
noreply at launchpad.net
Mon May 25 23:00:19 BST 2009
------------------------------------------------------------
revno: 54
committer: Jonathan Marsden <jmarsden at fastmail.fm>
branch nick: main
timestamp: Mon 2009-05-25 14:57:16 -0700
message:
Fix even more compiler warnings and add one more include stdio.h
modified:
debian/patches/12_fix_compiler_warnings.diff
debian/patches/40_missing_includes.diff
=== modified file 'debian/patches/12_fix_compiler_warnings.diff'
--- debian/patches/12_fix_compiler_warnings.diff 2009-05-25 19:35:12 +0000
+++ debian/patches/12_fix_compiler_warnings.diff 2009-05-25 21:57:16 +0000
@@ -1,8 +1,8 @@
Remove compiler warnings so SWORD will compile with -Wall -Werror
Index: main/src/mgr/filemgr.cpp
===================================================================
---- main.orig/src/mgr/filemgr.cpp 2009-05-25 10:08:05.000000000 -0700
-+++ main/src/mgr/filemgr.cpp 2009-05-25 10:12:13.000000000 -0700
+--- main.orig/src/mgr/filemgr.cpp 2009-05-25 14:52:54.000000000 -0700
++++ main/src/mgr/filemgr.cpp 2009-05-25 14:52:57.000000000 -0700
@@ -273,8 +273,7 @@
file->seek(0, SEEK_SET);
while (size > 0) {
@@ -33,8 +33,8 @@
::close(dfd);
Index: main/src/utilfuns/zlib/untgz.c
===================================================================
---- main.orig/src/utilfuns/zlib/untgz.c 2009-05-25 10:08:05.000000000 -0700
-+++ main/src/utilfuns/zlib/untgz.c 2009-05-25 10:15:31.000000000 -0700
+--- main.orig/src/utilfuns/zlib/untgz.c 2009-05-25 14:52:54.000000000 -0700
++++ main/src/utilfuns/zlib/untgz.c 2009-05-25 14:52:57.000000000 -0700
@@ -13,6 +13,8 @@
#include <fcntl.h>
#ifdef unix
@@ -95,8 +95,8 @@
Index: main/tests/testblocks.cpp
===================================================================
---- main.orig/tests/testblocks.cpp 2009-05-25 10:08:05.000000000 -0700
-+++ main/tests/testblocks.cpp 2009-05-25 10:12:13.000000000 -0700
+--- main.orig/tests/testblocks.cpp 2009-05-25 14:52:53.000000000 -0700
++++ main/tests/testblocks.cpp 2009-05-25 14:52:57.000000000 -0700
@@ -29,14 +29,18 @@
void addEntry(EntriesBlock *eb) {
string input;
@@ -175,8 +175,8 @@
}
Index: main/utilities/stepdump.cpp
===================================================================
---- main.orig/utilities/stepdump.cpp 2009-05-25 10:08:05.000000000 -0700
-+++ main/utilities/stepdump.cpp 2009-05-25 10:12:13.000000000 -0700
+--- main.orig/utilities/stepdump.cpp 2009-05-25 14:52:53.000000000 -0700
++++ main/utilities/stepdump.cpp 2009-05-25 14:53:05.000000000 -0700
@@ -151,33 +151,56 @@
@@ -380,8 +380,8 @@
cout << "headerControlWordArea:\n" << *buf << "\n";
Index: main/utilities/treeidxutil.cpp
===================================================================
---- main.orig/utilities/treeidxutil.cpp 2009-05-25 10:08:05.000000000 -0700
-+++ main/utilities/treeidxutil.cpp 2009-05-25 10:12:13.000000000 -0700
+--- main.orig/utilities/treeidxutil.cpp 2009-05-25 14:52:53.000000000 -0700
++++ main/utilities/treeidxutil.cpp 2009-05-25 14:52:57.000000000 -0700
@@ -49,27 +49,33 @@
@@ -454,8 +454,8 @@
switch (input[0]) {
Index: main/utilities/gbfidx.cpp
===================================================================
---- main.orig/utilities/gbfidx.cpp 2009-05-25 10:08:05.000000000 -0700
-+++ main/utilities/gbfidx.cpp 2009-05-25 10:12:13.000000000 -0700
+--- main.orig/utilities/gbfidx.cpp 2009-05-25 14:52:53.000000000 -0700
++++ main/utilities/gbfidx.cpp 2009-05-25 14:52:57.000000000 -0700
@@ -53,7 +53,7 @@
int main(int argc, char **argv)
{
@@ -572,8 +572,8 @@
}
Index: main/utilities/genbookutil.cpp
===================================================================
---- main.orig/utilities/genbookutil.cpp 2009-05-25 10:08:05.000000000 -0700
-+++ main/utilities/genbookutil.cpp 2009-05-25 10:14:46.000000000 -0700
+--- main.orig/utilities/genbookutil.cpp 2009-05-25 14:52:53.000000000 -0700
++++ main/utilities/genbookutil.cpp 2009-05-25 14:52:57.000000000 -0700
@@ -48,9 +48,11 @@
@@ -676,8 +676,8 @@
if (input.length() > 0) {
Index: main/utilities/vpl2mod.cpp
===================================================================
---- main.orig/utilities/vpl2mod.cpp 2009-05-25 10:08:05.000000000 -0700
-+++ main/utilities/vpl2mod.cpp 2009-05-25 10:12:13.000000000 -0700
+--- main.orig/utilities/vpl2mod.cpp 2009-05-25 14:52:53.000000000 -0700
++++ main/utilities/vpl2mod.cpp 2009-05-25 14:52:57.000000000 -0700
@@ -67,14 +67,18 @@
break;
}
@@ -702,8 +702,8 @@
// clean up any trailing junk on buf
Index: main/utilities/installmgr.cpp
===================================================================
---- main.orig/utilities/installmgr.cpp 2009-05-25 10:08:05.000000000 -0700
-+++ main/utilities/installmgr.cpp 2009-05-25 10:12:13.000000000 -0700
+--- main.orig/utilities/installmgr.cpp 2009-05-25 14:52:53.000000000 -0700
++++ main/utilities/installmgr.cpp 2009-05-25 14:52:57.000000000 -0700
@@ -62,8 +62,10 @@
cout << "then type yes at the prompt\n\n";
cout << "enable? [no] ";
@@ -719,8 +719,8 @@
return confirmed;
Index: main/utilities/step2vpl.cpp
===================================================================
---- main.orig/utilities/step2vpl.cpp 2009-05-25 10:08:05.000000000 -0700
-+++ main/utilities/step2vpl.cpp 2009-05-25 10:13:51.000000000 -0700
+--- main.orig/utilities/step2vpl.cpp 2009-05-25 14:52:53.000000000 -0700
++++ main/utilities/step2vpl.cpp 2009-05-25 14:52:57.000000000 -0700
@@ -218,93 +218,169 @@
@@ -1070,8 +1070,8 @@
void cleanBuf(char *buf) {
Index: main/utilities/cipherraw.cpp
===================================================================
---- main.orig/utilities/cipherraw.cpp 2009-05-25 10:08:05.000000000 -0700
-+++ main/utilities/cipherraw.cpp 2009-05-25 10:12:13.000000000 -0700
+--- main.orig/utilities/cipherraw.cpp 2009-05-25 14:52:53.000000000 -0700
++++ main/utilities/cipherraw.cpp 2009-05-25 14:52:57.000000000 -0700
@@ -43,7 +43,7 @@
SWCipher *zobj;
VerseKey key;
@@ -1150,8 +1150,8 @@
}
Index: main/src/modules/filters/teirtf.cpp
===================================================================
---- main.orig/src/modules/filters/teirtf.cpp 2009-05-25 10:33:13.000000000 -0700
-+++ main/src/modules/filters/teirtf.cpp 2009-05-25 10:35:44.000000000 -0700
+--- main.orig/src/modules/filters/teirtf.cpp 2009-05-25 14:52:53.000000000 -0700
++++ main/src/modules/filters/teirtf.cpp 2009-05-25 14:52:57.000000000 -0700
@@ -159,7 +159,7 @@
SWBuf type = tag.getAttribute("type");
@@ -1161,3 +1161,37 @@
// see if we have a VerseKey * or descendant
SWTRY {
vkey = SWDYNAMIC_CAST(VerseKey, u->key);
+Index: main/utilities/lexdump.c
+===================================================================
+--- main.orig/utilities/lexdump.c 2009-05-25 14:53:18.000000000 -0700
++++ main/utilities/lexdump.c 2009-05-25 14:54:46.000000000 -0700
+@@ -40,7 +40,7 @@
+
+ int main(int argc, char **argv) {
+ char *tmpbuf;
+- int idxfd, datfd;
++ int idxfd, datfd, r;
+ long offset;
+ unsigned int size;
+ char datbuf[255];
+@@ -59,11 +59,17 @@
+
+ offset = atoi(argv[2]) * 6;
+ lseek(idxfd, offset, SEEK_SET);
+- read(idxfd, &offset, 4);
+- read(idxfd, &size, 2);
++ r = read(idxfd, &offset, 4);
++ if (r != 4)
++ perror("ERROR: read failed in main");
++ r = read(idxfd, &size, 2);
++ if (r != 2)
++ perror("ERROR: read failed in main");
+ printf("offset: %ld; size: %d\n", offset, size);
+ lseek(datfd, offset, SEEK_SET);
+- read(datfd, datbuf, 40);
++ r = read(datfd, datbuf, 40);
++ if (r != 40)
++ perror("ERROR: read failed in main");
+ datbuf[40] = 0;
+ printf("%s\n", datbuf);
+ close(datfd);
=== modified file 'debian/patches/40_missing_includes.diff'
--- debian/patches/40_missing_includes.diff 2009-05-25 19:35:12 +0000
+++ debian/patches/40_missing_includes.diff 2009-05-25 21:57:16 +0000
@@ -1,8 +1,8 @@
Adding missing <stdio.h> includes in the testsuite.
Index: main/tests/localetest.cpp
===================================================================
---- main.orig/tests/localetest.cpp 2009-05-25 10:08:05.000000000 -0700
-+++ main/tests/localetest.cpp 2009-05-25 10:12:13.000000000 -0700
+--- main.orig/tests/localetest.cpp 2009-05-25 10:43:41.000000000 -0700
++++ main/tests/localetest.cpp 2009-05-25 14:51:45.000000000 -0700
@@ -18,6 +18,7 @@
#include <localemgr.h>
#include <versekey.h>
@@ -13,8 +13,8 @@
#endif
Index: main/tests/parsekey.cpp
===================================================================
---- main.orig/tests/parsekey.cpp 2009-05-25 10:08:05.000000000 -0700
-+++ main/tests/parsekey.cpp 2009-05-25 10:12:13.000000000 -0700
+--- main.orig/tests/parsekey.cpp 2009-05-25 10:43:40.000000000 -0700
++++ main/tests/parsekey.cpp 2009-05-25 14:51:45.000000000 -0700
@@ -16,6 +16,7 @@
*/
@@ -25,8 +25,8 @@
#include <localemgr.h>
Index: main/tests/rawldidxtest.cpp
===================================================================
---- main.orig/tests/rawldidxtest.cpp 2009-05-25 10:08:05.000000000 -0700
-+++ main/tests/rawldidxtest.cpp 2009-05-25 10:12:13.000000000 -0700
+--- main.orig/tests/rawldidxtest.cpp 2009-05-25 10:43:40.000000000 -0700
++++ main/tests/rawldidxtest.cpp 2009-05-25 14:51:45.000000000 -0700
@@ -19,6 +19,7 @@
#include <rawstr.h>
#include <swmgr.h>
@@ -37,8 +37,8 @@
#include <io.h>
Index: main/tests/filtertest.cpp
===================================================================
---- main.orig/tests/filtertest.cpp 2009-05-25 10:08:05.000000000 -0700
-+++ main/tests/filtertest.cpp 2009-05-25 10:12:13.000000000 -0700
+--- main.orig/tests/filtertest.cpp 2009-05-25 10:43:41.000000000 -0700
++++ main/tests/filtertest.cpp 2009-05-25 14:51:45.000000000 -0700
@@ -20,6 +20,7 @@
#include <filemgr.h>
#include <papyriplain.h>
@@ -47,3 +47,15 @@
//#include <swmgr.h>
#ifndef NO_SWORD_NAMESPACE
using namespace sword;
+Index: main/utilities/stepdump.cpp
+===================================================================
+--- main.orig/utilities/stepdump.cpp 2009-05-25 14:52:05.000000000 -0700
++++ main/utilities/stepdump.cpp 2009-05-25 14:52:17.000000000 -0700
+@@ -17,6 +17,7 @@
+
+ #include <iostream>
+ #include <string>
++#include <stdio.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+
--
Main packaging branch
https://code.launchpad.net/~pkgcrosswire/libsword/main
Your team Crosswire Packaging Team is subscribed to branch lp:libsword.
To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/libsword/main/+edit-subscription.
More information about the Pkg-crosswire-devel
mailing list