Merge changes I61437d9b,I30bb7a34

* changes:
  [generator.fsm, generator.c, genmodel.fsm] avoid warnings in generated code
  [modellib.c, examples.c] avoid warnings in generated code