[Pinfo-devel] r161 - pinfo/trunk/src

[Bas Zoetekouw]

Author: bas
Date: 2005-09-04 00:16:53 +0000 (Sun, 04 Sep 2005)
New Revision: 161

Modified:
   pinfo/trunk/src/initializelinks.c
   pinfo/trunk/src/manual.c
   pinfo/trunk/src/parse_config.c
   pinfo/trunk/src/video.c
Log:
Backport of r155->r156 from the cxx branch:
 - Fix an apparent off-by-one error in mouse handling
 - Fix return type of tmpfiles routines


Modified: pinfo/trunk/src/initializelinks.c
===================================================================
--- pinfo/trunk/src/initializelinks.c	2005-09-03 23:55:39 UTC (rev 160)
+++ pinfo/trunk/src/initializelinks.c	2005-09-04 00:16:53 UTC (rev 161)
@@ -486,6 +486,7 @@
 		 * matches different info file.                                                *
 		 ******************************************************************************/
 		/* make sure that we don't handle notes, which fit in the second line */
+		/* Signed-unsigned issues FIXME */
 		if ((long)(notestart - buf) < strlen(line1))
 		{
 			/* we can handle only those, who are in the first line, or who are split up into two lines */

Modified: pinfo/trunk/src/manual.c
===================================================================
--- pinfo/trunk/src/manual.c	2005-09-03 23:55:39 UTC (rev 160)
+++ pinfo/trunk/src/manual.c	2005-09-04 00:16:53 UTC (rev 161)
@@ -1447,7 +1447,7 @@
 				{
 					if ((mouse.y > 0) &&(mouse.y < maxy - 1))
 					{
-						for (i = selected; i > 0; i--)
+						for (i = selected; i >= 0; i--)
 						{
 							if (manuallinks[i].line == mouse.y + manualpos - 1)
 							{
@@ -1488,7 +1488,7 @@
 				{
 					if ((mouse.y > 0) &&(mouse.y < maxy - 1))
 					{
-						for (i = selected; i > 0; i--)
+						for (i = selected; i >= 0; i--)
 						{
 							if (manuallinks[i].line == mouse.y + manualpos - 1)
 							{

Modified: pinfo/trunk/src/parse_config.c
===================================================================
--- pinfo/trunk/src/parse_config.c	2005-09-03 23:55:39 UTC (rev 160)
+++ pinfo/trunk/src/parse_config.c	2005-09-04 00:16:53 UTC (rev 161)
@@ -953,8 +953,7 @@
 char *
 str_toupper(char *str)
 {
-	int i;
-
+	unsigned int i;
 	for (i = 0; i < strlen(str); ++i)
 		if (islower(str[i]))
 			str[i] = toupper(str[i]);

Modified: pinfo/trunk/src/video.c
===================================================================
--- pinfo/trunk/src/video.c	2005-09-03 23:55:39 UTC (rev 160)
+++ pinfo/trunk/src/video.c	2005-09-04 00:16:53 UTC (rev 161)
@@ -191,6 +191,7 @@
 				}
 				else
 				{
+					int j;
 					char tmp = hyperobjects[i].node[hyperobjects[i].breakpos];
 					hyperobjects[i].node[hyperobjects[i].breakpos] = 0;
 					info_addstr(1 + hyperobjects[i].line - pos,
@@ -263,6 +264,7 @@
 		long maxpos = pos +(maxy - 2);
 		if (maxpos > lines)
 			maxpos = lines;
+		int i;
 		for (i = pos; i < maxpos; i++)
 		{
 			int maxregexp = aftersearch ? h_regexp_num + 1 : h_regexp_num;
@@ -270,6 +272,7 @@
 			 * if it is after search, then we have user defined regexps+
 			 * a searched regexp to highlight
 			 */
+			int j;
 			for (j = 0; j < maxregexp; j++)
 			{
 				char *str = message[i];