Some warnings fixes, properly scoped inter module links in case a module exports two different functions

with the same name.

Author: tyranid

ProcessPrx.C

@@ -1401,7 +1401,14 @@ bool CProcessPrx::ReadString(u32 dwAddr, std::string &str, bool unicode, u32 *dw
 		{
 			if((ch >= 32) && (ch < 127))
 			{
-				curr += (unsigned char) ch;
+				if((m_blXmlDump) && (ch == '<'))
+				{
+					curr += "&lt;";
+				}
+				else
+				{
+					curr += (unsigned char) ch;
+				}
 				iRealLen++;
 			}
 			else
@@ -1533,21 +1540,30 @@ void CProcessPrx::Disasm(FILE *fp, u32 dwAddr, u32 iSize, unsigned char *pData,
 								  }
 								  if(s->exported.size() > 0)
 								  {
-									  int i;
+									  unsigned int i;
 									  for(i = 0; i < s->exported.size(); i++)
 									  {
-										  fprintf(fp, "; Exported in %s\n", s->exported[i]->name);
+										if(m_blXmlDump)
+										{
+											fprintf(fp, "<a name=\"%s_%s\"></a>; Exported in %s\n", 
+													s->exported[i]->name, s->name.c_str(), s->exported[i]->name);
+										}
+										else
+										{
+											fprintf(fp, "; Exported in %s\n", s->exported[i]->name);
+										}
 									  }
 								  }
 								  if(s->imported.size() > 0)
 								  {
-									  int i;
+									  unsigned int i;
 									  for(i = 0; i < s->imported.size(); i++)
 									  {
 										  if((m_blXmlDump) && (strlen(s->imported[i]->file) > 0))
 										  {
-											  fprintf(fp, "; Imported from <a href=\"%s.html#%s\">%s</a>\n", 
-													  s->imported[i]->file, s->name.c_str(), s->imported[i]->file);
+											  fprintf(fp, "; Imported from <a href=\"%s.html#%s_%s\">%s</a>\n", 
+													  s->imported[i]->file, s->imported[i]->name, 
+													  s->name.c_str(), s->imported[i]->file);
 										  }
 										  else
 										  {

disasm.C

@@ -905,10 +905,8 @@ static char *print_jumpr(int reg, char *output, unsigned int *realregs)
 	{
 		return print_jump(realregs[reg], output);
 	}
-	else
-	{
-		return print_cpureg(reg, output);
-	}
+
+	return print_cpureg(reg, output);
 }
 
 static char *print_syscall(unsigned int syscall, char *output)

getargs.C

@@ -109,12 +109,13 @@ char **GetArgs(int *argc, char **argv, struct ArgEntry *entry, int argcount)
 										*argint = ent->val;
 									 }
 									 break;
-				case ARG_TYPE_FUNC: ArgFunc argfunc = (ArgFunc) ent->argvoid; 
+				case ARG_TYPE_FUNC: { ArgFunc argfunc = (ArgFunc) ent->argvoid; 
 								    if(argfunc(NULL) == 0)
 									{
 										fprintf(stderr, "Error processing argument for %s\n", arg);
 										error = 1;
 									}
+									}
 									break;
 				default: fprintf(stderr, "Invalid type for option %s\n", arg);
 						 error = 1;
@@ -139,18 +140,21 @@ char **GetArgs(int *argc, char **argv, struct ArgEntry *entry, int argcount)
 
 			switch(ent->type)
 			{
-				case ARG_TYPE_INT: int *argint = (int*) ent->argvoid;
+				case ARG_TYPE_INT: { int *argint = (int*) ent->argvoid;
 								   *argint = strtoul(argv[0], NULL, 0);
+								   }
 								   break;
-				case ARG_TYPE_STR: const char **argstr = (const char **) ent->argvoid;
+				case ARG_TYPE_STR: { const char **argstr = (const char **) ent->argvoid;
 								   *argstr = argv[0];
+								   }
 								   break;
-				case ARG_TYPE_FUNC: ArgFunc argfunc = (ArgFunc) ent->argvoid; 
+				case ARG_TYPE_FUNC: { ArgFunc argfunc = (ArgFunc) ent->argvoid; 
 								    if(argfunc(argv[0]) == 0)
 									{
 										fprintf(stderr, "Error processing argument for %s\n", arg);
 										error = 1;
 									}
+									}
 									break;
 				default: fprintf(stderr, "Invalid type for option %s\n", arg);
 						 error = 1;

main.C

@@ -197,7 +197,7 @@ int process_args(int argc, char **argv)
 
 void print_help()
 {
-	int i;
+	unsigned int i;
 	COutput::Printf(LEVEL_INFO, "Usage: prxtool [options...] file\n");
 	COutput::Printf(LEVEL_INFO, "Options:\n");
 
@@ -332,7 +332,6 @@ void output_disasm(const char *file, FILE *out_fp, CNidMgr *nids)
 {
 	CProcessPrx prx(g_dwBase);
 	bool blRet;
-	int i;
 
 	COutput::Printf(LEVEL_INFO, "Loading %s\n", file);
 	prx.SetNidMgr(nids);