Merge branch 'feature/coverity-scan' of github.com:ennorehling/eressea into feature/coverity-scan

This commit is contained in:
Enno Rehling 2015-10-29 20:40:51 +01:00
commit 77ad91f8a4
2 changed files with 4 additions and 4 deletions

View File

@ -36,7 +36,7 @@ static int tolua_storage_create(lua_State * L)
FILE * F; FILE * F;
F = fopen(filename, type); F = fopen(filename, type);
if (!F) { if (F) {
gamedata *data = (gamedata *)calloc(1, sizeof(gamedata)); gamedata *data = (gamedata *)calloc(1, sizeof(gamedata));
storage *store = (storage *)calloc(1, sizeof(storage)); storage *store = (storage *)calloc(1, sizeof(storage));
data->store = store; data->store = store;

View File

@ -89,11 +89,11 @@ extern "C" {
struct faction *faction; struct faction *faction;
struct building *building; struct building *building;
struct ship *ship; struct ship *ship;
unsigned short number; /* persons */ int number; /* persons */
short age; int age;
/* skill data */ /* skill data */
short skill_size; int skill_size;
struct skill *skills; struct skill *skills;
struct item *items; struct item *items;
reservation *reservations; reservation *reservations;