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

[Nathanael Nerode]

Author: neroden-guest
Date: 2005-08-23 00:20:15 +0000 (Tue, 23 Aug 2005)
New Revision: 33

Modified:
   pinfo/trunk/src/filehandling_functions.c
   pinfo/trunk/src/initializelinks.c
   pinfo/trunk/src/manual.c
   pinfo/trunk/src/menu_and_note_utils.c
   pinfo/trunk/src/video.c
Log:
Eliminate unused variables in several functions in several files.



Modified: pinfo/trunk/src/filehandling_functions.c
===================================================================
--- pinfo/trunk/src/filehandling_functions.c	2005-08-23 00:02:39 UTC (rev 32)
+++ pinfo/trunk/src/filehandling_functions.c	2005-08-23 00:20:15 UTC (rev 33)
@@ -679,7 +679,7 @@
 	char *buf = xmalloc(1024);	/* holds local copy of filename */
 	char *bufend;			/* points at the trailing 0 of initial name */
 	char command[1128];		/* holds command to evaluate for decompression of file */
-	int i, j, twoloops;
+	int i, j;
 	char *tmpfilename;
 
 	if (strncmp(filename, "dir", 3) == 0)

Modified: pinfo/trunk/src/initializelinks.c
===================================================================
--- pinfo/trunk/src/initializelinks.c	2005-08-23 00:02:39 UTC (rev 32)
+++ pinfo/trunk/src/initializelinks.c	2005-08-23 00:20:15 UTC (rev 33)
@@ -109,7 +109,6 @@
 void
 freelinks()			/* frees space allocated previously by node-links */
 {
-	int i;
 	if ((hyperobjects)&&(hyperobjectcount))
 		xfree(hyperobjects);
 	hyperobjects = 0;

Modified: pinfo/trunk/src/manual.c
===================================================================
--- pinfo/trunk/src/manual.c	2005-08-23 00:02:39 UTC (rev 32)
+++ pinfo/trunk/src/manual.c	2005-08-23 00:20:15 UTC (rev 33)
@@ -223,7 +223,6 @@
 		{
 			char *base = xmalloc(1024);
 			char *ptr, *eptr;
-			int tmppos;
 			int namelen = strlen(manuallinks[which].name);
 			strcpy(base, manual[manuallinks[which].line + 1]);
 			strip_manual(base);
@@ -1705,7 +1704,7 @@
 			char *tmpstr = strippedline;
 			while (!regexec(&h_regexp[j], tmpstr, 1, pmatch, 0))
 			{
-				int n = pmatch[0].rm_eo - pmatch[0].rm_so, k;
+				int n = pmatch[0].rm_eo - pmatch[0].rm_so;
 				int rx = pmatch[0].rm_so + tmpstr - strippedline;
 				int curY, curX;
 				char tmpchr;
@@ -1801,7 +1800,7 @@
 					attrset(url);
 				if (manuallinks[i].carry == 1)
 				{
-					int x, y, ltline = manuallinks[i].line + 1;
+					int ltline = manuallinks[i].line + 1;
 					/*
 					 * the split part to find is lying down
 					 * to the line defined in manlinks(line+1)

Modified: pinfo/trunk/src/menu_and_note_utils.c
===================================================================
--- pinfo/trunk/src/menu_and_note_utils.c	2005-08-23 00:02:39 UTC (rev 32)
+++ pinfo/trunk/src/menu_and_note_utils.c	2005-08-23 00:20:15 UTC (rev 33)
@@ -50,7 +50,7 @@
 void
 getnextnode(char *type, char *node)
 {
-	int j, coloncount = 0;
+	int j;
 #ifndef ___USE_STATIC___
 	char *tmp = xmalloc(strlen(type) + 1);
 #else
@@ -85,7 +85,7 @@
 void
 getprevnode(char *type, char *node)
 {
-	int j, coloncount = 0;
+	int j;
 #ifndef ___USE_STATIC___
 	char *tmp = xmalloc(strlen(type) + 1);
 #else
@@ -120,7 +120,7 @@
 void
 getupnode(char *type, char *node)
 {
-	int j, coloncount = 0;
+	int j;
 #ifndef ___USE_STATIC___
 	char *tmp = xmalloc(strlen(type) + 1);
 #else
@@ -156,7 +156,7 @@
 void
 getnodename(char *type, char *node)
 {
-	int j, coloncount = 0;
+	int j;
 #ifndef ___USE_STATIC___
 	char *tmp = xmalloc(strlen(type) + 1);
 #else

Modified: pinfo/trunk/src/video.c
===================================================================
--- pinfo/trunk/src/video.c	2005-08-23 00:02:39 UTC (rev 32)
+++ pinfo/trunk/src/video.c	2005-08-23 00:20:15 UTC (rev 33)
@@ -273,7 +273,7 @@
 				char *str = message[i];
 				while (!regexec(&h_regexp[j], str, 1, pmatch, 0))
 				{
-					int n = pmatch[0].rm_eo - pmatch[0].rm_so, k;
+					int n = pmatch[0].rm_eo - pmatch[0].rm_so;
 					int y = i - pos + 1, x = calculate_len(message[i], pmatch[0].rm_so + str);
 					int txtoffset = pmatch[0].rm_so + str - message[i];
 					char tmp;