[Pinfo-devel] r65 - pinfo/branches/cxx/src

[Nathanael Nerode]

Author: neroden-guest
Date: 2005-08-29 02:58:39 +0000 (Mon, 29 Aug 2005)
New Revision: 65

Modified:
   pinfo/branches/cxx/src/datatypes.h
   pinfo/branches/cxx/src/mainfunction.cxx
   pinfo/branches/cxx/src/manual.cxx
Log:
Make searchagain.lastsearch a std::string.



Modified: pinfo/branches/cxx/src/datatypes.h
===================================================================
--- pinfo/branches/cxx/src/datatypes.h	2005-08-29 02:48:02 UTC (rev 64)
+++ pinfo/branches/cxx/src/datatypes.h	2005-08-29 02:58:39 UTC (rev 65)
@@ -37,7 +37,7 @@
 
 typedef struct
 {
-	char lastsearch[256];	/* last searched regexp */
+	std::string lastsearch;	/* last searched regexp */
 	char type;				/* type of the last search (global/local) */
 	int search;				/* if true -- search again */
 }

Modified: pinfo/branches/cxx/src/mainfunction.cxx
===================================================================
--- pinfo/branches/cxx/src/mainfunction.cxx	2005-08-29 02:48:02 UTC (rev 64)
+++ pinfo/branches/cxx/src/mainfunction.cxx	2005-08-29 02:58:39 UTC (rev 65)
@@ -291,7 +291,7 @@
 				if (!searchagain.search)	/* if searchagain key wasn't hit */
 				{
 					token = getstring(_("Enter regexp: "));	/* get the token */
-					strcpy(searchagain.lastsearch, token);	/* and save it to searchagain buffer */
+					searchagain.lastsearch = token;	/* and save it to searchagain buffer */
 					/*
 					 * give a hint, which key to ungetch to call this procedure
 					 * by searchagain
@@ -300,9 +300,9 @@
 				}
 				else /* it IS searchagain */
 				{
-					token = (char*)xmalloc(strlen(searchagain.lastsearch) + 1);
+					token = (char*)xmalloc(searchagain.lastsearch.length() + 1);
 					/* allocate space for token */
-					strcpy(token, searchagain.lastsearch);
+					strcpy(token, searchagain.lastsearch.c_str());
 					/* copy the token from searchagain buffer */
 					searchagain.search = 0;
 					/* reset the searchagain swith(until it's set again
@@ -551,13 +551,13 @@
 				if (!searchagain.search)	/* searchagain handler. see totalsearch */
 				{
 					token = getstring(_("Enter regexp: "));
-					strcpy(searchagain.lastsearch, token);
+					searchagain.lastsearch = token;
 					searchagain.type = key;
 				}
 				else
 				{
-					token = (char*)xmalloc(strlen(searchagain.lastsearch) + 1);
-					strcpy(token, searchagain.lastsearch);
+					token = (char*)xmalloc(searchagain.lastsearch.length() + 1);
+					strcpy(token, searchagain.lastsearch.c_str());
 					searchagain.search = 0;
 				}		/* end of searchagain handler */
 				if (strlen(token) == 0)

Modified: pinfo/branches/cxx/src/manual.cxx
===================================================================
--- pinfo/branches/cxx/src/manual.cxx	2005-08-29 02:48:02 UTC (rev 64)
+++ pinfo/branches/cxx/src/manual.cxx	2005-08-29 02:58:39 UTC (rev 65)
@@ -192,7 +192,8 @@
 	if (!manuallinks[which].carry)
 	{
 		/* workaround for names starting with '(' */
-		if (manuallinks[which].name[0] == '(') strcpy(buf, manuallinks[which].name + 1);
+		if (manuallinks[which].name[0] == '(')
+			strcpy(buf, manuallinks[which].name + 1);
 		else strcpy(buf, manuallinks[which].name);
 		return;
 	}
@@ -956,13 +957,13 @@
 				if (!searchagain.search)
 				{
 					token = getstring(_("Enter regexp: "));
-					strcpy(searchagain.lastsearch, token);
+					searchagain.lastsearch = token;
 					searchagain.type = key;
 				}
 				else
 				{
-					token = (char*)xmalloc(strlen(searchagain.lastsearch) + 1);
-					strcpy(token, searchagain.lastsearch);
+					token = (char*)xmalloc(searchagain.lastsearch.length() + 1);
+					strcpy(token, searchagain.lastsearch.c_str());
 					searchagain.search = 0;
 				}		/* end of searchagain handler */
 				if (strlen(token) == 0)