Changeset 452 in dev for trunk

Timestamp:

Mar 22, 2008, 9:30:11 PM (17 years ago)

Author:

dai_9181

Message:

[451]を64bit版にマージ。

File:

• trunk/ab5.0/abdev/BasicCompiler64/MakePeHdr.cpp (modified) (2 diffs)

trunk/ab5.0/abdev/BasicCompiler64/MakePeHdr.cpp

@@ -577 +577 @@
         ExportNamesLength=lstrlen(lpExportNames)+1;
 
-        UserProc *pUserProc,*psi2;
-        while(1){
+        while(1)
+        {
+            UserProc *pUserProc = NULL;
+
             //辞書順にサーチ
             temporary[0]=0;
@@ -584 +586 @@
             while( compiler.GetObjectModule().meta.GetUserProcs().Iterator_HasNext() )
             {
-                pUserProc = compiler.GetObjectModule().meta.GetUserProcs().Iterator_GetNext();
-                if(pUserProc->IsExport()){
+                UserProc *pTempUserProc = compiler.GetObjectModule().meta.GetUserProcs().Iterator_GetNext();
+                if(pTempUserProc->IsExport()){
                     if(temporary[0]=='\0'){
-                        lstrcpy(temporary,pUserProc->GetName().c_str());
-                        psi2=pUserProc;
+                        lstrcpy(temporary,pTempUserProc->GetName().c_str());
+                        pUserProc = pTempUserProc;
                     }
                     else{
                         i3=lstrlen(temporary);
-                        i4=(int)pUserProc->GetName().size();
+                        i4=(int)pTempUserProc->GetName().size();
                         if(i3<i4) i3=i4;
-                        if(memcmp(temporary,pUserProc->GetName().c_str(),i3)>0){
-                            lstrcpy(temporary,pUserProc->GetName().c_str());
-                            psi2=pUserProc;
+                        if(memcmp(temporary,pTempUserProc->GetName().c_str(),i3)>0){
+                            lstrcpy(temporary,pTempUserProc->GetName().c_str());
+                            pUserProc = pTempUserProc;
                         }
                     }
                 }
             }
-            if(psi2==0) break;
-            pUserProc=psi2;
+            if( pUserProc == NULL )
+            {
+                break;
+            }
 
             pUserProc->ExportOff();