[sword-cvs] sword/include filemgr.h,1.15,1.16 rawfiles.h,1.17,1.18 rawverse.h,1.13,1.14 swbuf.h,1.3,1.4 swmodule.h,1.58,1.59

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/include
In directory www:/tmp/cvs-serv2325/include

Modified Files:
	filemgr.h rawfiles.h rawverse.h swbuf.h swmodule.h 
Log Message:
no message

Index: filemgr.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/filemgr.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** filemgr.h	1 Oct 2002 19:52:40 -0000	1.15
--- filemgr.h	25 Feb 2003 04:12:47 -0000	1.16
***************
*** 43,47 ****
  
  public:
!    FileDesc (FileMgr * parent, char *path, int mode, int perms, bool tryDowngrade);
     virtual ~FileDesc ();
    int getFd ();
--- 43,47 ----
  
  public:
!    FileDesc (FileMgr * parent, const char *path, int mode, int perms, bool tryDowngrade);
     virtual ~FileDesc ();
    int getFd ();
***************
*** 64,69 ****
      FileMgr (int maxFiles = 35);
     ~FileMgr ();
!   FileDesc *open (char *path, int mode, bool tryDowngrade);
!   FileDesc *open (char *path, int mode, int perms = S_IREAD | S_IWRITE, bool tryDowngrade = false);
    void close (FileDesc *);
  
--- 64,69 ----
      FileMgr (int maxFiles = 35);
     ~FileMgr ();
!   FileDesc *open (const char *path, int mode, bool tryDowngrade);
!   FileDesc *open (const char *path, int mode, int perms = S_IREAD | S_IWRITE, bool tryDowngrade = false);
    void close (FileDesc *);
  

Index: rawfiles.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/rawfiles.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** rawfiles.h	20 Feb 2003 07:25:19 -0000	1.17
--- rawfiles.h	25 Feb 2003 04:12:47 -0000	1.18
***************
*** 34,38 ****
  class SWDLLEXPORT RawFiles : public RawVerse, public SWCom {
  
! 	char *getnextfilename();
  
  public:
--- 34,38 ----
  class SWDLLEXPORT RawFiles : public RawVerse, public SWCom {
  
! 	char *getNextFilename();
  
  public:

Index: rawverse.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/rawverse.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** rawverse.h	1 Oct 2002 19:52:40 -0000	1.13
--- rawverse.h	25 Feb 2003 04:12:47 -0000	1.14
***************
*** 13,16 ****
--- 13,17 ----
  
  #include <defs.h>
+ #include <swbuf.h>
  
  SWORD_NAMESPACE_START
***************
*** 23,37 ****
  
  	char *path;
! 	void preptext(char *buf);
! 	void settext(char testmt, long idxoff, const char *buf, long len = -1);
! 	void linkentry(char testmt, long destidxoff, long srcidxoff);
  
  public:
  	static const char *nl;
  	RawVerse(const char *ipath, int fileMode = -1);
! 	virtual ~ RawVerse();
! 	void findoffset(char testmt, long idxoff, long *start,
! 	unsigned short *end);
! 	void readtext(char testmt, long start, unsigned short size, char *buf);
  	static char createModule(const char *path);
  };
--- 24,37 ----
  
  	char *path;
! 	void prepText(SWBuf &buf);
! 	void doSetText(char testmt, long idxoff, const char *buf, long len = -1);
! 	void doLinkEntry(char testmt, long destidxoff, long srcidxoff);
  
  public:
  	static const char *nl;
  	RawVerse(const char *ipath, int fileMode = -1);
! 	virtual ~RawVerse();
! 	void findOffset(char testmt, long idxoff, long *start,	unsigned short *end);
! 	void readText(char testmt, long start, unsigned short size, SWBuf &buf);
  	static char createModule(const char *path);
  };

Index: swbuf.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swbuf.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** swbuf.h	24 Feb 2003 05:26:15 -0000	1.3
--- swbuf.h	25 Feb 2003 04:12:47 -0000	1.4
***************
*** 63,66 ****
--- 63,68 ----
  	void append(char ch);
  	void appendFormatted(const char *format, ...);
+ 	
+ 	char *getRawData() { return buf; }	// be careful!  Probably setSize needs to be called in conjunction before and maybe after
  
  	operator const char *() const { return c_str(); }

Index: swmodule.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swmodule.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** swmodule.h	20 Feb 2003 07:25:20 -0000	1.58
--- swmodule.h	25 Feb 2003 04:12:47 -0000	1.59
***************
*** 113,118 ****
  
  	static SWDisplay rawdisp;
! 	char *entrybuf;
! 	unsigned long entrybufallocsize;
  
  	/** executed to remove all markup (for searches) */
--- 113,117 ----
  
  	static SWDisplay rawdisp;
! 	SWBuf entryBuf;
  
  	/** executed to remove all markup (for searches) */