[sword-svn] r3181 - in branches/sword-1-7-x: . include src/modules/common
greg.hellings at crosswire.org
greg.hellings at crosswire.org
Wed Apr 16 21:27:57 MST 2014
Author: greg.hellings
Date: 2014-04-16 21:27:57 -0700 (Wed, 16 Apr 2014)
New Revision: 3181
Modified:
branches/sword-1-7-x/
branches/sword-1-7-x/include/rawstr.h
branches/sword-1-7-x/include/rawstr4.h
branches/sword-1-7-x/include/rawverse.h
branches/sword-1-7-x/include/rawverse4.h
branches/sword-1-7-x/src/modules/common/rawstr.cpp
branches/sword-1-7-x/src/modules/common/rawstr4.cpp
branches/sword-1-7-x/src/modules/common/rawverse.cpp
branches/sword-1-7-x/src/modules/common/rawverse4.cpp
Log:
Merging r3134 - standardize class field names.
Property changes on: branches/sword-1-7-x
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:2989-2991,2997,3001-3004,3006,3010-3013,3015-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3133
+ /trunk:2989-2991,2997,3001-3004,3006,3010-3013,3015-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3134
Modified: branches/sword-1-7-x/include/rawstr.h
===================================================================
--- branches/sword-1-7-x/include/rawstr.h 2014-04-17 04:26:37 UTC (rev 3180)
+++ branches/sword-1-7-x/include/rawstr.h 2014-04-17 04:27:57 UTC (rev 3181)
@@ -49,7 +49,7 @@
static const int IDXENTRYSIZE;
public:
- static char nl;
+ static const char nl;
RawStr(const char *ipath, int fileMode = -1, bool caseSensitive = false);
virtual ~RawStr();
void getIDXBuf(long ioffset, char **buf) const;
Modified: branches/sword-1-7-x/include/rawstr4.h
===================================================================
--- branches/sword-1-7-x/include/rawstr4.h 2014-04-17 04:26:37 UTC (rev 3180)
+++ branches/sword-1-7-x/include/rawstr4.h 2014-04-17 04:27:57 UTC (rev 3181)
@@ -48,7 +48,7 @@
void doSetText(const char *key, const char *buf, long len = -1);
void doLinkEntry(const char *destkey, const char *srckey);
public:
- char nl;
+ static const char nl;
RawStr4(const char *ipath, int fileMode = -1, bool caseSensitive = false);
virtual ~RawStr4();
void getIDXBuf(long ioffset, char **buf) const;
Modified: branches/sword-1-7-x/include/rawverse.h
===================================================================
--- branches/sword-1-7-x/include/rawverse.h 2014-04-17 04:26:37 UTC (rev 3180)
+++ branches/sword-1-7-x/include/rawverse.h 2014-04-17 04:27:57 UTC (rev 3181)
@@ -47,7 +47,7 @@
void doLinkEntry(char testmt, long destidxoff, long srcidxoff);
public:
- static const char *nl;
+ static const char nl;
RawVerse(const char *ipath, int fileMode = -1);
virtual ~RawVerse();
void findOffset(char testmt, long idxoff, long *start, unsigned short *end) const;
Modified: branches/sword-1-7-x/include/rawverse4.h
===================================================================
--- branches/sword-1-7-x/include/rawverse4.h 2014-04-17 04:26:37 UTC (rev 3180)
+++ branches/sword-1-7-x/include/rawverse4.h 2014-04-17 04:27:57 UTC (rev 3181)
@@ -48,7 +48,7 @@
void doLinkEntry(char testmt, long destidxoff, long srcidxoff);
public:
- static const char *nl;
+ static const char nl;
RawVerse4(const char *ipath, int fileMode = -1);
virtual ~RawVerse4();
void findOffset(char testmt, long idxoff, long *start, unsigned long *end) const;
Modified: branches/sword-1-7-x/src/modules/common/rawstr.cpp
===================================================================
--- branches/sword-1-7-x/src/modules/common/rawstr.cpp 2014-04-17 04:26:37 UTC (rev 3180)
+++ branches/sword-1-7-x/src/modules/common/rawstr.cpp 2014-04-17 04:27:57 UTC (rev 3181)
@@ -43,7 +43,7 @@
*/
int RawStr::instance = 0;
-char RawStr::nl = '\n';
+const char RawStr::nl = '\n';
const int RawStr::IDXENTRYSIZE = 6;
@@ -372,7 +372,6 @@
__s32 shiftSize;
__u16 size;
__u16 outsize;
- static const char nl[] = {13, 10};
char *tmpbuf = 0;
char *key = 0;
char *dbKey = 0;
@@ -452,7 +451,7 @@
datfd->write(outbuf, (int)size);
// add a new line to make data file easier to read in an editor
- datfd->write(&nl, 2);
+ datfd->write(&nl, 1);
idxfd->write(&outstart, 4);
idxfd->write(&outsize, 2);
Modified: branches/sword-1-7-x/src/modules/common/rawstr4.cpp
===================================================================
--- branches/sword-1-7-x/src/modules/common/rawstr4.cpp 2014-04-17 04:26:37 UTC (rev 3180)
+++ branches/sword-1-7-x/src/modules/common/rawstr4.cpp 2014-04-17 04:27:57 UTC (rev 3181)
@@ -44,6 +44,7 @@
*/
int RawStr4::instance = 0;
+const char RawStr4::nl = '\n';
const int RawStr4::IDXENTRYSIZE = 8;
@@ -59,7 +60,6 @@
{
SWBuf buf;
- nl = '\n';
lastoff = -1;
path = 0;
stdstr(&path, ipath);
@@ -380,7 +380,6 @@
__s32 shiftSize;
__u32 size;
__u32 outsize;
- static const char nl[] = {13, 10};
char *tmpbuf = 0;
char *key = 0;
char *dbKey = 0;
@@ -460,7 +459,7 @@
datfd->write(outbuf, (long)size);
// add a new line to make data file easier to read in an editor
- datfd->write(&nl, 2);
+ datfd->write(&nl, 1);
idxfd->write(&outstart, 4);
idxfd->write(&outsize, 4);
Modified: branches/sword-1-7-x/src/modules/common/rawverse.cpp
===================================================================
--- branches/sword-1-7-x/src/modules/common/rawverse.cpp 2014-04-17 04:26:37 UTC (rev 3180)
+++ branches/sword-1-7-x/src/modules/common/rawverse.cpp 2014-04-17 04:27:57 UTC (rev 3181)
@@ -45,7 +45,7 @@
*/
int RawVerse::instance = 0;
-const char *RawVerse::nl = "\r\n";
+const char RawVerse::nl = '\n';
/******************************************************************************
@@ -194,7 +194,7 @@
textfp[testmt-1]->write(buf, (int)size);
// add a new line to make data file easier to read in an editor
- textfp[testmt-1]->write(nl, 2);
+ textfp[testmt-1]->write(&nl, 1);
}
else {
start = 0;
Modified: branches/sword-1-7-x/src/modules/common/rawverse4.cpp
===================================================================
--- branches/sword-1-7-x/src/modules/common/rawverse4.cpp 2014-04-17 04:26:37 UTC (rev 3180)
+++ branches/sword-1-7-x/src/modules/common/rawverse4.cpp 2014-04-17 04:27:57 UTC (rev 3181)
@@ -46,7 +46,7 @@
*/
int RawVerse4::instance = 0;
-const char *RawVerse4::nl = "\r\n";
+const char RawVerse4::nl = '\n';
/******************************************************************************
@@ -195,7 +195,7 @@
textfp[testmt-1]->write(buf, (int)size);
// add a new line to make data file easier to read in an editor
- textfp[testmt-1]->write(nl, 2);
+ textfp[testmt-1]->write(&nl, 1);
}
else {
start = 0;
More information about the sword-cvs
mailing list