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

[Nathanael Nerode]

Author: neroden-guest
Date: 2005-08-30 15:02:58 +0000 (Tue, 30 Aug 2005)
New Revision: 103

Modified:
   pinfo/branches/cxx/src/filehandling_functions.cxx
Log:
Vital but mindless cleanup in loadtagtable


Modified: pinfo/branches/cxx/src/filehandling_functions.cxx
===================================================================
--- pinfo/branches/cxx/src/filehandling_functions.cxx	2005-08-30 14:52:17 UTC (rev 102)
+++ pinfo/branches/cxx/src/filehandling_functions.cxx	2005-08-30 15:02:58 UTC (rev 103)
@@ -341,8 +341,6 @@
 	long i;
 	char *wsk, *wsk1;
 	int is_indirect = 0;
-	register unsigned int j;
-	register char *res;
 	int cut = 0;			/* holds the number of corrupt lines */
 
 	/*
@@ -376,12 +374,9 @@
 		if (wsk1 < check)
 		{
 			(*wsk1) = 0;
-			/*
-			 * original: sprintf(tag_table[i-cut].nodename,"%s",wsk);
-			 * below is a faster version.
-			 */
-			res = (char*)memcpy(tag_table[i - cut].nodename, wsk, j =(size_t)(wsk1 - wsk));
-			(*(res += j + 1)) = 0;
+			strcpy(tag_table[i - cut].nodename, wsk);
+			(*(tag_table[i - cut].nodename + (wsk1 - wsk) + 1)) = 0; 
+				/* Just terminating the bugger */
 			(*wsk1) = INDIRECT_TAG;
 			wsk1++;
 			tag_table[i - cut].offset = atoi(wsk1);