Index: source/ircaux.c
===================================================================
RCS file: /home/cvs/repository/epic4/source/ircaux.c,v
retrieving revision 1.74
diff -u -3 -p -r1.74 ircaux.c
--- source/ircaux.c	9 May 2003 04:29:52 -0000	1.74
+++ source/ircaux.c	15 May 2003 08:51:52 -0000
@@ -3830,7 +3830,7 @@ int     word_count (const char *str)
 
 /* 
  * XXX XXX XXX -- This is expensive, and ugly, but it counts words
- * in the same way as new_next_word, and that is all that counts for now.
+ * in the same way as new_next_arg, and that is all that counts for now.
  */
 int	word_count (const char *ptr)
 {
@@ -3843,7 +3843,7 @@ int	word_count (const char *ptr)
 	while (*ptr && risspace(*ptr))
 		ptr++;
 
-	while (ptr && *ptr)
+	while (*ptr)
 	{
 		/* Always pre-count words */
 		count++;
Index: source/functions.c
===================================================================
RCS file: /home/cvs/repository/epic4/source/functions.c,v
retrieving revision 1.117
diff -u -3 -p -r1.117 functions.c
--- source/functions.c	9 May 2003 04:29:52 -0000	1.117
+++ source/functions.c	15 May 2003 08:51:55 -0000
@@ -2839,8 +2839,8 @@ BUILT_IN_FUNCTION(function_chr, word)
 
 	aboo = new_malloc(word_count(word) + 1);
 	ack = aboo;
-	
-	while ((blah = next_arg(word, &word)))
+
+	while ((blah = new_next_arg(word, &word)))
 		*ack++ = (char)my_atol(blah);
 
 	*ack = '\0';