Просмотр исходного кода

ncd: NCDInterpProcess: remove redundant argument in Init

ambrop7 13 лет назад
Родитель
Сommit
9c7741e3a8
3 измененных файлов с 5 добавлено и 4 удалено
  1. 3 2
      ncd/NCDInterpProcess.c
  2. 1 1
      ncd/NCDInterpProcess.h
  3. 1 1
      ncd/NCDInterpProg.c

+ 3 - 2
ncd/NCDInterpProcess.c

@@ -145,14 +145,15 @@ fail:
     return 0;
 }
 
-int NCDInterpProcess_Init (NCDInterpProcess *o, NCDBlock *block, NCDProcess *process, NCDPlaceholderDb *pdb, NCDModuleIndex *module_index, NCDMethodIndex *method_index)
+int NCDInterpProcess_Init (NCDInterpProcess *o, NCDProcess *process, NCDPlaceholderDb *pdb, NCDModuleIndex *module_index, NCDMethodIndex *method_index)
 {
-    ASSERT(block)
     ASSERT(process)
     ASSERT(pdb)
     ASSERT(module_index)
     ASSERT(method_index)
     
+    NCDBlock *block = NCDProcess_Block(process);
+    
     if (NCDBlock_NumStatements(block) > INT_MAX) {
         BLog(BLOG_ERROR, "too many statements");
         goto fail0;

+ 1 - 1
ncd/NCDInterpProcess.h

@@ -72,7 +72,7 @@ typedef struct {
     DebugObject d_obj;
 } NCDInterpProcess;
 
-int NCDInterpProcess_Init (NCDInterpProcess *o, NCDBlock *block, NCDProcess *process, NCDPlaceholderDb *pdb, NCDModuleIndex *module_index, NCDMethodIndex *method_index) WARN_UNUSED;
+int NCDInterpProcess_Init (NCDInterpProcess *o, NCDProcess *process, NCDPlaceholderDb *pdb, NCDModuleIndex *module_index, NCDMethodIndex *method_index) WARN_UNUSED;
 void NCDInterpProcess_Free (NCDInterpProcess *o);
 int NCDInterpProcess_FindStatement (NCDInterpProcess *o, int from_index, const char *name);
 const char * NCDInterpProcess_StatementCmdName (NCDInterpProcess *o, int i);

+ 1 - 1
ncd/NCDInterpProg.c

@@ -73,7 +73,7 @@ int NCDInterpProg_Init (NCDInterpProg *o, NCDProgram *prog, NCDPlaceholderDb *pd
         e->name = NCDProcess_Name(p);
         e->proc = p;
         
-        if (!NCDInterpProcess_Init(&e->iblock, NCDProcess_Block(p), p, pdb, module_index, method_index)) {
+        if (!NCDInterpProcess_Init(&e->iblock, p, pdb, module_index, method_index)) {
             BLog(BLOG_ERROR, "NCDInterpProcess_Init failed");
             goto fail2;
         }