home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved allocation and freeing of Win structs into windows library.
[plomrogue]
/
src
/
wincontrol.c
diff --git
a/src/wincontrol.c
b/src/wincontrol.c
index 793b75e2d6205b896656da6ca6cf077189b77e6d..74c9c2a297d6fc9e0fcca3c1afdd83855cd56e2c 100644
(file)
--- a/
src/wincontrol.c
+++ b/
src/wincontrol.c
@@
-15,14
+15,6
@@
-extern void free_win(struct Win * win)
-{
- free(win->_title);
- free(win);
-}
-
-
-
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 *))
{
@@
-54,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;
exit_err(fclose(file), world, err);
struct WinMeta * wmeta = world->wins.meta;
- struct Win * w = malloc(sizeof(struct Win));
- init_win(wmeta,
w
, title, height, width, world, f);
+ struct Win * w
p; //
= malloc(sizeof(struct Win));
+ init_win(wmeta,
&wp
, title, height, width, world, f);
free(title);
free(title);
- return w;
+ return w
p
;
}
}