X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fwincontrol.c;h=74c9c2a297d6fc9e0fcca3c1afdd83855cd56e2c;hb=c1a7e6cdb13cd7d883424afdf0fe08e9a10fbc28;hp=cfa593b42455b81e58dd1ff325c89a128a87d1a9;hpb=f8325a4ea617b15315183d7a8027c0b913c91034;p=plomrogue diff --git a/src/wincontrol.c b/src/wincontrol.c index cfa593b..74c9c2a 100644 --- a/src/wincontrol.c +++ b/src/wincontrol.c @@ -15,8 +15,8 @@ -extern struct Win init_win_from_file(struct World * world, char * w_name, - void (* f) (struct Win *)) +extern struct Win * init_win_from_file(struct World * world, char * w_name, + void (* f) (struct Win *)) { char * err = "Trouble in init_win_from_file() with malloc()."; char * prefix = "config/windows/"; @@ -35,7 +35,8 @@ extern struct Win init_win_from_file(struct World * world, char * w_name, err = "Trouble in init_win_from_file() with fgets()."; exit_err(NULL == fgets(line, linemax, file), world, err); char * title = malloc(strlen(line)); - memcpy(title, line, strlen(line) - 1); + memcpy(title, line, strlen(line) - 1); /* Eliminate newline char at end */ + title[strlen(line) - 1] = '\0'; /* of string. */ exit_err(NULL == fgets(line, linemax, file), world, err); int16_t height = atoi(line); exit_err(NULL == fgets(line, linemax, file), world, err); @@ -45,10 +46,10 @@ extern struct Win init_win_from_file(struct World * world, char * w_name, exit_err(fclose(file), world, err); struct WinMeta * wmeta = world->wins.meta; - struct Win w; - init_win(wmeta, &w, title, height, width, world, f); + struct Win * wp; // = malloc(sizeof(struct Win)); + init_win(wmeta, &wp, title, height, width, world, f); free(title); - return w; + return wp; }