[sword-cvs] sword/src/keys listkey.cpp,1.17,1.18 strkey.cpp,1.6,1.7 swkey.cpp,1.15,1.16 treekeyidx.cpp,1.13,1.14 versekey.cpp,1.57,1.58

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/src/keys
In directory www:/tmp/cvs-serv19920/src/keys

Modified Files:
	listkey.cpp strkey.cpp swkey.cpp treekeyidx.cpp versekey.cpp 
Log Message:
no message

Index: listkey.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/keys/listkey.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** listkey.cpp	22 Nov 2002 05:04:27 -0000	1.17
--- listkey.cpp	27 Jun 2003 01:41:07 -0000	1.18
***************
*** 6,10 ****
  
  #include <utilfuns.h>
- #include <string.h>
  #include <stdlib.h>
  #include <swkey.h>
--- 6,9 ----

Index: strkey.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/keys/strkey.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** strkey.cpp	1 Oct 2002 19:52:40 -0000	1.6
--- strkey.cpp	27 Jun 2003 01:41:07 -0000	1.7
***************
*** 8,12 ****
  #include <utilfuns.h>
  #include <strkey.h>
- #include <string.h>
  #include <stdio.h>
  
--- 8,11 ----

Index: swkey.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/keys/swkey.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** swkey.cpp	21 Oct 2002 22:48:24 -0000	1.15
--- swkey.cpp	27 Jun 2003 01:41:07 -0000	1.16
***************
*** 7,11 ****
  #include <swkey.h>
  #include <utilfuns.h>
- #include <string.h>
  
  SWORD_NAMESPACE_START
--- 7,10 ----

Index: treekeyidx.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/keys/treekeyidx.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** treekeyidx.cpp	21 Oct 2002 00:30:37 -0000	1.13
--- treekeyidx.cpp	27 Jun 2003 01:41:07 -0000	1.14
***************
*** 25,29 ****
  #include <stdio.h>
  #include <errno.h>
- #include <string>
  
  #ifndef __GNUC__
--- 25,28 ----
***************
*** 130,139 ****
  const char *TreeKeyIdx::getFullName() const {
  	TreeNode parent;
! 	static std::string fullPath;
  	fullPath = currentNode.name;
  	parent.parent = currentNode.parent;
  	while (parent.parent > -1) {
  		getTreeNodeFromIdxOffset(parent.parent, &parent);
! 		fullPath = ((std::string)parent.name) + (std::string) "/" + fullPath;
  	}
  	return fullPath.c_str();
--- 129,138 ----
  const char *TreeKeyIdx::getFullName() const {
  	TreeNode parent;
! 	static SWBuf fullPath;
  	fullPath = currentNode.name;
  	parent.parent = currentNode.parent;
  	while (parent.parent > -1) {
  		getTreeNodeFromIdxOffset(parent.parent, &parent);
! 		fullPath = ((SWBuf)parent.name) + (SWBuf) "/" + fullPath;
  	}
  	return fullPath.c_str();
***************
*** 306,310 ****
  		node->firstChild = swordtoarch32(tmp);
  
! 		std::string name;
  		do {
  			read(datfd->getFd(), &ch, 1);
--- 305,309 ----
  		node->firstChild = swordtoarch32(tmp);
  
! 		SWBuf name;
  		do {
  			read(datfd->getFd(), &ch, 1);

Index: versekey.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/keys/versekey.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** versekey.cpp	17 Jun 2003 21:53:33 -0000	1.57
--- versekey.cpp	27 Jun 2003 01:41:07 -0000	1.58
***************
*** 5,9 ****
  #include <swmacs.h>
  #include <utilfuns.h>
- #include <string.h>
  #include <stdio.h>
  #include <fcntl.h>
--- 5,8 ----