[sword-cvs] sword/src/mgr installmgr.cpp,1.11,1.12
sword@www.crosswire.org
sword@www.crosswire.org
Sun, 13 Jul 2003 00:14:50 -0700
Update of /usr/local/cvsroot/sword/src/mgr
In directory www:/tmp/cvs-serv30933
Modified Files:
installmgr.cpp
Log Message:
multiple declarations of i (aren't ISO compliant)
Index: installmgr.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/mgr/installmgr.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- installmgr.cpp 9 Jul 2003 21:58:21 -0000 1.11
+++ installmgr.cpp 13 Jul 2003 07:14:48 -0000 1.12
@@ -334,6 +334,7 @@
int InstallMgr::FTPCopy(InstallSource *is, const char *src, const char *dest, bool dirTransfer, const char *suffix) {
terminate = false;
+ long i;
void *session = FTPOpenSession();
SWBuf url = (SWBuf)"ftp://" + is->source + is->directory.c_str() + "/"; //dont forget the final slash
if (FTPURLGetFile(session, "dirlist", url.c_str())) {
@@ -348,10 +349,10 @@
}
long totalBytes = 0;
- for (int i = 0; i < dirList.size(); i++)
+ for (i = 0; i < dirList.size(); i++)
totalBytes += dirList[i].size;
long completedBytes = 0;
- for (int i = 0; i < dirList.size(); i++) {
+ for (i = 0; i < dirList.size(); i++) {
if (dirList[i].flagtrycwd != 1) {
SWBuf buffer = (SWBuf)dest + "/" + (dirList[i].name);
if (!strcmp(&buffer.c_str()[buffer.length()-strlen(suffix)], suffix)) {