Merge pull request sargon#19 from osandov/master

A couple of fixes
Cigaes · Nov 26, 2014 · 57475e2 · 57475e2
2 parents 377fac4 + 5d87755
commit 57475e2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,5 @@
 Makefile.config
 config.h
+*.o
+*.dep
+trayer
diff --git a/misc.c b/misc.c
@@ -401,7 +401,7 @@ get_net_wm_state(Window win, net_wm_state *nws)
 
 
     ENTER;
-    bzero(nws, sizeof(nws));
+    memset(nws, 0, sizeof(*nws));
     if (!(state = get_xaproperty(win, a_NET_WM_STATE, XA_ATOM, &num3)))
         RET();
 
@@ -442,7 +442,7 @@ get_net_wm_window_type(Window win, net_wm_window_type *nwwt)
 
 
     ENTER;
-    bzero(nwwt, sizeof(nwwt));
+    memset(nwwt, 0, sizeof(*nwwt));
     if (!(state = get_xaproperty(win, a_NET_WM_WINDOW_TYPE, XA_ATOM, &num3)))
         RET();