From 00875a40f2f3916f4f0a496da3cdbaef9fab24c8 Mon Sep 17 00:00:00 2001 From: okan Date: Wed, 8 Oct 2014 15:31:01 +0000 Subject: no need for calloc(1,.. here, malloc is fine since we initialize --- screen.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/screen.c b/screen.c index 42aa572..4ca44a9 100644 --- a/screen.c +++ b/screen.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: screen.c,v 1.69 2014/10/08 12:48:51 okan Exp $ + * $OpenBSD: screen.c,v 1.70 2014/10/08 15:31:01 okan Exp $ */ #include @@ -38,7 +38,7 @@ screen_init(int which) XSetWindowAttributes rootattr; unsigned int nwins, i; - sc = xcalloc(1, sizeof(*sc)); + sc = xmalloc(sizeof(*sc)); TAILQ_INIT(&sc->clientq); TAILQ_INIT(&sc->regionq); @@ -48,6 +48,7 @@ screen_init(int which) sc->rootwin = RootWindow(X_Dpy, sc->which); sc->cycling = 0; sc->hideall = 0; + conf_screen(sc); xu_ewmh_net_supported(sc); -- cgit v1.2.3-2-gb3c3