summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOkan Demirmen <okan@cvs.openbsd.org>2014-10-08 15:31:02 +0000
committerOkan Demirmen <okan@cvs.openbsd.org>2014-10-08 15:31:02 +0000
commit4583e673e11d36c6f0007d6a6e0b0c3322e6e2ee (patch)
treeb760f925d7c1486598b66f387d2a30b945761ce1
parentd07b14b74ce6fa98fae7867306d1c71d80473f14 (diff)
no need for calloc(1,.. here, malloc is fine since we initialize
-rw-r--r--app/cwm/screen.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/cwm/screen.c b/app/cwm/screen.c
index 42aa57247..4ca44a9b6 100644
--- a/app/cwm/screen.c
+++ b/app/cwm/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 <sys/param.h>
@@ -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);