[sword-svn] r2062 - in trunk: bindings/corba/java include src/utilfuns

[scribe at www.crosswire.org]

Author: scribe
Date: 2007-07-19 10:27:31 -0700 (Thu, 19 Jul 2007)
New Revision: 2062

Modified:
   trunk/bindings/corba/java/Makefile
   trunk/include/utilstr.h
   trunk/src/utilfuns/utilstr.cpp
Log:
comment cleanups
more normalized Makefile


Modified: trunk/bindings/corba/java/Makefile
===================================================================
--- trunk/bindings/corba/java/Makefile	2007-07-19 17:26:18 UTC (rev 2061)
+++ trunk/bindings/corba/java/Makefile	2007-07-19 17:27:31 UTC (rev 2062)
@@ -1,4 +1,6 @@
-TOMCAT_HOME=/usr/local/tomcat
+TOMCAT_HOME=/opt/tomcat
+#SERVLET_LIB=${TOMCAT_HOME}/common/lib/servlet-api.jar
+SERVLET_LIB=${TOMCAT_HOME}/lib/servlet-api.jar
 instdir=/home/swordweb/livehtml/webapp
 all: src/org/crosswire/sword/orb/SWMgr.java classes/org/crosswire/sword/orb/SwordOrb.class
 
@@ -6,7 +8,7 @@
 	idlj -pkgTranslate swordorb org.crosswire.sword.orb -td src ../swordorb.idl
 
 classes/org/crosswire/sword/orb/SwordOrb.class: src/org/crosswire/sword/orb/SwordOrb.java
-	javac -classpath ${TOMCAT_HOME}/common/lib/servlet-api.jar -d classes -sourcepath src src/org/crosswire/sword/orb/*.java src/org/crosswire/util/*.java
+	javac -classpath ${SERVLET_LIB} -d classes -sourcepath src src/org/crosswire/sword/orb/*.java src/org/crosswire/util/*.java
 
 
 clean:

Modified: trunk/include/utilstr.h
===================================================================
--- trunk/include/utilstr.h	2007-07-19 17:26:18 UTC (rev 2061)
+++ trunk/include/utilstr.h	2007-07-19 17:27:31 UTC (rev 2062)
@@ -26,22 +26,14 @@
 
 SWORD_NAMESPACE_START
 
-/** Use stdstr to copy a const char* to a char*
+/** stdstr - clone a string
 */
 char *stdstr (char **iistr, const char *istr, unsigned int memPadFactor = 1);
 char *strstrip (char *istr);
 const char *stristr (const char *s1, const char *s2);
 int strnicmp(const char *s1, const char *s2, int len);
 int stricmp(const char *s1, const char *s2);
-// char *toupperstr(char *buf);
-// char *toupperstr_utf8(char *buf, unsigned int max = 0);
 
-/*
-extern "C" {
-int stricmp(const char *s1, const char *s2);
-}
-*/
-
 /******************************************************************************
  * SW_toupper - array of uppercase values for any given Latin-1 value
  *

Modified: trunk/src/utilfuns/utilstr.cpp
===================================================================
--- trunk/src/utilfuns/utilstr.cpp	2007-07-19 17:26:18 UTC (rev 2061)
+++ trunk/src/utilfuns/utilstr.cpp	2007-07-19 17:27:31 UTC (rev 2062)
@@ -57,7 +57,7 @@
 
 
 /******************************************************************************
- * stdstr - Sets/gets a string
+ * stdstr - clones a string
  *
  * ENT:	ipstr	- pointer to a string pointer to set if necessary
  *	istr	- string to set to *ipstr