[sword-svn] r3909 - in trunk: . include src/modules/filters tests

[scribe at crosswire.org]

Author: scribe
Date: 2025-07-12 12:46:35 -0400 (Sat, 12 Jul 2025)
New Revision: 3909

Modified:
   trunk/configure.ac
   trunk/include/swversion.h
   trunk/src/modules/filters/gbfstrongs.cpp
   trunk/src/modules/filters/gbfwordjs.cpp
   trunk/src/modules/filters/greeklexattribs.cpp
   trunk/src/modules/filters/osisstrongs.cpp
   trunk/src/modules/filters/thmlstrongs.cpp
   trunk/src/modules/filters/thmlwordjs.cpp
   trunk/tests/translittest.cpp
Log:
address build and warnings of latest Fedora gcc


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2025-07-09 16:01:16 UTC (rev 3908)
+++ trunk/configure.ac	2025-07-12 16:46:35 UTC (rev 3909)
@@ -308,11 +308,11 @@
 fi
 
 if test x$with_cxx11regex = xyes; then
-	AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11REGEX -std=c++11"
+	AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11REGEX"
 fi
 
 if test x$with_cxx11time = xyes; then
-	AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11TIME -std=c++11"
+	AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11TIME"
 fi
 
 if test x$disable_logdebug = xyes; then

Modified: trunk/include/swversion.h
===================================================================
--- trunk/include/swversion.h	2025-07-09 16:01:16 UTC (rev 3908)
+++ trunk/include/swversion.h	2025-07-12 16:46:35 UTC (rev 3909)
@@ -24,12 +24,12 @@
 #ifndef SWVERSION_H
 #define SWVERSION_H
 
-#define SWORD_VERSION_NUM 1090003887
-#define SWORD_VERSION_STR "1.9.0.3887"
+#define SWORD_VERSION_NUM 1090003908
+#define SWORD_VERSION_STR "1.9.0.3908M"
 #define SWORD_VERSION_MAJOR 1
 #define SWORD_VERSION_MINOR 9
 #define SWORD_VERSION_MICRO 0
-#define SWORD_VERSION_NANO 3887
+#define SWORD_VERSION_NANO 3908
 
 #include <defs.h>
 SWORD_NAMESPACE_START

Modified: trunk/src/modules/filters/gbfstrongs.cpp
===================================================================
--- trunk/src/modules/filters/gbfstrongs.cpp	2025-07-09 16:01:16 UTC (rev 3908)
+++ trunk/src/modules/filters/gbfstrongs.cpp	2025-07-12 16:46:35 UTC (rev 3909)
@@ -58,7 +58,7 @@
 	bool lastspace = false;
 	int word = 1;
 	char val[128];
-	char wordstr[11];
+	char wordstr[12];
 	char *valto;
 	unsigned int textStart = 0, textEnd = 0;
 	bool newText = false;

Modified: trunk/src/modules/filters/gbfwordjs.cpp
===================================================================
--- trunk/src/modules/filters/gbfwordjs.cpp	2025-07-09 16:01:16 UTC (rev 3908)
+++ trunk/src/modules/filters/gbfwordjs.cpp	2025-07-12 16:46:35 UTC (rev 3909)
@@ -137,7 +137,7 @@
 				text += token;
 				text += '>';
 				if (needWordOut) {
-					char wstr[11];
+					char wstr[12];
 					sprintf(wstr, "%03d", word-2);
 					AttributeValue *wAttrs = &(module->getEntryAttributes()["Word"][wstr]);
 					needWordOut = false;
@@ -234,7 +234,7 @@
 			}
 		}
 
-		char wstr[11];
+		char wstr[12];
 		sprintf(wstr, "%03d", word-1);
 		AttributeValue *wAttrs = &(module->getEntryAttributes()["Word"][wstr]);
 		needWordOut = false;

Modified: trunk/src/modules/filters/greeklexattribs.cpp
===================================================================
--- trunk/src/modules/filters/greeklexattribs.cpp	2025-07-09 16:01:16 UTC (rev 3908)
+++ trunk/src/modules/filters/greeklexattribs.cpp	2025-07-12 16:46:35 UTC (rev 3909)
@@ -44,7 +44,7 @@
 		string phrase;
 		string freq;
 		char val[128], *valto;
-		char wordstr[11];
+		char wordstr[12];
 		const char *currentPhrase = 0;
 		const char *currentPhraseEnd = 0;
 		int number = 0;

Modified: trunk/src/modules/filters/osisstrongs.cpp
===================================================================
--- trunk/src/modules/filters/osisstrongs.cpp	2025-07-09 16:01:16 UTC (rev 3908)
+++ trunk/src/modules/filters/osisstrongs.cpp	2025-07-12 16:46:35 UTC (rev 3909)
@@ -57,7 +57,7 @@
 	SWBuf token;
 	bool intoken = false;
 	int wordNum = 1;
-	char wordstr[11];
+	char wordstr[12];
 	const char *wordStart = 0;
 	SWBuf page = "";		// some modules include <seg> page info, so we add these to the words
 

Modified: trunk/src/modules/filters/thmlstrongs.cpp
===================================================================
--- trunk/src/modules/filters/thmlstrongs.cpp	2025-07-09 16:01:16 UTC (rev 3908)
+++ trunk/src/modules/filters/thmlstrongs.cpp	2025-07-12 16:46:35 UTC (rev 3909)
@@ -60,7 +60,7 @@
 	bool lastspace = false;
 	int word = 1;
 	char val[128];
-	char wordstr[11];
+	char wordstr[12];
 	char *valto;
 	char *ch;
 	unsigned int textStart = 0, textEnd = 0;

Modified: trunk/src/modules/filters/thmlwordjs.cpp
===================================================================
--- trunk/src/modules/filters/thmlwordjs.cpp	2025-07-09 16:01:16 UTC (rev 3908)
+++ trunk/src/modules/filters/thmlwordjs.cpp	2025-07-12 16:46:35 UTC (rev 3909)
@@ -151,7 +151,7 @@
 				text += token;
 				text += '>';
 				if (needWordOut) {
-					char wstr[11];
+					char wstr[12];
 					sprintf(wstr, "%03d", word-2);
 					AttributeValue *wAttrs = &(module->getEntryAttributes()["Word"][wstr]);
 					needWordOut = false;
@@ -248,7 +248,7 @@
 			}
 		}
 
-		char wstr[11];
+		char wstr[12];
 		sprintf(wstr, "%03d", word-1);
 		AttributeValue *wAttrs = &(module->getEntryAttributes()["Word"][wstr]);
 		needWordOut = false;

Modified: trunk/tests/translittest.cpp
===================================================================
--- trunk/tests/translittest.cpp	2025-07-09 16:01:16 UTC (rev 3908)
+++ trunk/tests/translittest.cpp	2025-07-12 16:46:35 UTC (rev 3909)
@@ -49,7 +49,7 @@
     buf[actualLen] = 0;
     //printf("%s", buf);
     std::cout << buf;
-    delete buf;
+    delete [] buf;
 }