Index: generic/nsfInt.h
===================================================================
diff -u -rb089be700bb58579a48e77619512a47eb3c5562d -r878a74b68b15d4ee5c33d345e670f50ce7473ebc
--- generic/nsfInt.h	(.../nsfInt.h)	(revision b089be700bb58579a48e77619512a47eb3c5562d)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 878a74b68b15d4ee5c33d345e670f50ce7473ebc)
@@ -179,8 +179,7 @@
 #  define MEM_COUNT_RELEASE()
 #endif
 
-# define STRING_NEW(target, p, l)  (target) = ckalloc((unsigned)(l)+1u); strncpy((target), (p), (l)); *((target)+(l)) = '\0'; \
-  MEM_COUNT_ALLOC(#target, (target))
+# define STRING_NEW(target, p, l)  (target) = strndup(p,l); MEM_COUNT_ALLOC(#target, (target))
 # define STRING_FREE(key, p)  MEM_COUNT_FREE((key), (p)); ckfree((p))
 
 #define DSTRING_INIT(dsPtr) Tcl_DStringInit(dsPtr); MEM_COUNT_ALLOC("DString",(dsPtr))
@@ -714,9 +713,9 @@
   NSF_RENAME
 } NsfGlobalNames;
 #if !defined(NSF_C)
-EXTERN char *NsfGlobalStrings[];
+EXTERN const char *NsfGlobalStrings[];
 #else
-char *NsfGlobalStrings[] = {
+const char *NsfGlobalStrings[] = {
   "", "0", "1",
   /* methods called internally */
   "configure", "initialize", "getParameterSpec",
@@ -1125,7 +1124,7 @@
 
 EXTERN int NsfObjWrongArgs(Tcl_Interp *interp, CONST char *msg,
 			   Tcl_Obj *cmdName, Tcl_Obj *methodName,
-			   char *arglist)
+			   const char *arglist)
   nonnull(1) nonnull(2);
 
 EXTERN CONST char *NsfMethodName(Tcl_Obj *methodObj)