some fixes from static analysis

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@22344 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Sep 17, 2014 · ddff833 · ddff833
1 parent 655b3c7
commit ddff833
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/SimulationRuntime/c/optimization/eval_all/EvalG.c b/SimulationRuntime/c/optimization/eval_all/EvalG.c
@@ -660,7 +660,7 @@ static inline void printMaxError(Number *g, const int m, const int nx, const int
   int index_x = 0;
   double gmax = -1;
   int i, j, k, l;
-  int ii, jj, kk;
+  int ii, jj, kk = -1;
   double tmp, tmp1;
 
   for(i = 0, l = 0; i < nsi-1; ++i){

diff --git a/SimulationRuntime/c/optimization/eval_all/EvalL.c b/SimulationRuntime/c/optimization/eval_all/EvalL.c
@@ -147,8 +147,8 @@ Bool ipopt_h(int n, double *vopt, Bool new_x, double obj_factor, int m, double *
     memcpy(data->simulationInfo.integerVarsPre, optData->i0Pre, nInteger*sizeof(modelica_integer));
     memcpy(data->simulationInfo.booleanVarsPre, optData->b0Pre, nBoolean*sizeof(modelica_boolean));
     memcpy(data->simulationInfo.realVarsPre, optData->v0Pre, nReal*sizeof(modelica_real));
-    memcpy(data->simulationInfo.relationsPre, optData->rePre, nBoolean*sizeof(modelica_boolean));
-    memcpy(data->simulationInfo.relations, optData->re, nBoolean*sizeof(modelica_boolean));
+    memcpy(data->simulationInfo.relationsPre, optData->rePre, nRelations*sizeof(modelica_boolean));
+    memcpy(data->simulationInfo.relations, optData->re, nRelations*sizeof(modelica_boolean));
 
     for(ii = 0, k = 0, v = vopt, la = lambda; ii + 1 < nsi; ++ii){
       for(p = 1; p < np1; ++p, v += nv, la += nJ){