[Commit] nickle ChangeLog, 1.132, 1.133 builtin-string.c, 1.11, 1.12 file.c, 1.67, 1.68 lex.l, 1.82, 1.83 rational.c, 1.30, 1.31

[Keith Packard]

Committed by: keithp

Update of /local/src/CVS/nickle
In directory home.keithp.com:/tmp/cvs-serv5360

Modified Files:
	ChangeLog builtin-string.c file.c lex.l rational.c 
Log Message:
2005-08-02  Keith Packard  <keithp at keithp.com>

	* builtin-string.c: (do_String_index), (do_String_substr):
	* file.c: (FileStringWidth), (FilePutString):
	* lex.l:
	* rational.c: (RationalDecimalPrint):
	Fix compiler warnings about signed/unsigned mismatches
	for StringNextChar (thanks GCC 4)

	* debian/changelog:
	* debian/control:
	Update for version 2.49
	Use new readline (5), update policy to 3.6.2


Index: ChangeLog
===================================================================
RCS file: /local/src/CVS/nickle/ChangeLog,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- ChangeLog	3 Aug 2005 04:42:52 -0000	1.132
+++ ChangeLog	3 Aug 2005 06:34:05 -0000	1.133
@@ -1,3 +1,17 @@
+2005-08-02  Keith Packard  <keithp at keithp.com>
+
+	* builtin-string.c: (do_String_index), (do_String_substr):
+	* file.c: (FileStringWidth), (FilePutString):
+	* lex.l:
+	* rational.c: (RationalDecimalPrint):
+	Fix compiler warnings about signed/unsigned mismatches
+	for StringNextChar (thanks GCC 4)
+
+	* debian/changelog:
+	* debian/control:
+	Update for version 2.49
+	Use new readline (5), update policy to 3.6.2
+
 2005-08-02  Bart Massey  <bart at cs.pdx.edu>
 	
 	* doc/tutorial/basics/invoke.sgml, nickle.1.in:

Index: builtin-string.c
===================================================================
RCS file: /local/src/CVS/nickle/builtin-string.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- builtin-string.c	8 Jun 2004 09:30:53 -0000	1.11
+++ builtin-string.c	3 Aug 2005 06:34:05 -0000	1.12
@@ -125,7 +125,7 @@
     i = 0;
     while (a < p)
     {
-	int c;
+	unsigned c;
 	a = StringNextChar (a, &c, &al);
 	i++;
     }
@@ -170,7 +170,7 @@
      */
     while (b > 0)
     {
-	int ch;
+	unsigned ch;
 	a = StringNextChar (a, &ch, &alen);
 	b--;
     }
@@ -181,7 +181,7 @@
     elen = alen;
     while (c > 0)
     {
-	int ch;
+	unsigned ch;
 	e = StringNextChar (e, &ch, &elen);
 	c--;
     }

Index: file.c
===================================================================
RCS file: /local/src/CVS/nickle/file.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- file.c	14 Jan 2005 05:44:00 -0000	1.67
+++ file.c	3 Aug 2005 06:34:05 -0000	1.68
@@ -1311,7 +1311,7 @@
     else
     {
 	int	    width = 2;
-	int	    c;
+	unsigned    c;
 	while ((string = StringNextChar (string, &c, &length)))
 	{
 	    if (c < ' ' || '~' < c)
@@ -1345,7 +1345,7 @@
 	FilePutsc (f, string, length);
     else
     {
-	int c;
+	unsigned c;
 	FileOutput (f, '"');
 	while ((string = StringNextChar (string, &c, &length))) 
 	{

Index: lex.l
===================================================================
RCS file: /local/src/CVS/nickle/lex.l,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- lex.l	14 Jan 2005 05:44:00 -0000	1.82
+++ lex.l	3 Aug 2005 06:34:05 -0000	1.83
@@ -445,9 +445,10 @@
 "\r"		;
 \'([^\n\']|\\\')*\'	{
 			ENTER ();
-			char	 *s;
-			long	len = yyleng - 1;
-			int	c;
+			char	    *s;
+			long	    len = yyleng - 1;
+			unsigned    c;
+
 			s = yytext + 1;
 			s = StringNextChar (s, &c, &len);
 			if (c == '\\')
@@ -456,8 +457,9 @@
 				c = 0;
 			    else if ('0' <= c && c <= '7')
 			    {
-				int	ch;
-				char    *ps = s;
+				unsigned    ch;
+				char	    *ps = s;
+
 				c = c - '0';
 				while ((s = StringNextChar (s, &ch, &len)) &&
 				       '0' <= ch && ch <= '7')
@@ -477,9 +479,9 @@
 		}
 \"([^\n\"]|\\\")*\"	{
 			ENTER ();
-			char	*d, *s;
-			int	c;
-			long	len = yyleng - 2;
+			char	    *d, *s;
+			unsigned    c;
+			long	    len = yyleng - 2;
 
 			yylval.value = NewString (len);
 			d = StringChars (&yylval.value->string);
@@ -492,9 +494,10 @@
 				    break;
 				if ('0' <= c && c <= '7')
 				{
-				    int	    ch;
-    				    char    *ps = s;
-				    long    plen = len;
+				    unsigned	ch;
+    				    char	*ps = s;
+				    long	plen = len;
+
 				    c = c - '0';
 				    while ((s = StringNextChar (s, &ch, &len)) &&
 					   '0' <= ch && ch <= '7')

Index: rational.c
===================================================================
RCS file: /local/src/CVS/nickle/rational.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- rational.c	5 Jun 2005 01:03:42 -0000	1.30
+++ rational.c	3 Aug 2005 06:34:05 -0000	1.31
@@ -752,7 +752,7 @@
     char	*initial = 0, *in;
     char	*repeat = 0, *re;
     char	*whole;
-    int		initial_width, repeat_width;
+    int		initial_width, repeat_width = 0;
     int		frac_width;
     int		rep_width, brace_width = 0, dot_width = 0;
     int		whole_width;