summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOkan Demirmen <okan@cvs.openbsd.org>2013-07-08 15:46:17 +0000
committerOkan Demirmen <okan@cvs.openbsd.org>2013-07-08 15:46:17 +0000
commit01bae6830b63e90d70d81aa607126141d8774cfd (patch)
tree2c8bf7e0d21ea1820c8511374b9566ef413301ba
parent36bdc1a7cd9c42ecdafa8c332f46b3c7ee7bb085 (diff)
whitespace and style fixes; from Tiago Cunha and one from me.
-rw-r--r--app/cwm/calmwm.c6
-rw-r--r--app/cwm/xevents.c4
2 files changed, 4 insertions, 6 deletions
diff --git a/app/cwm/calmwm.c b/app/cwm/calmwm.c
index 6a6d01b76..4fc641d8e 100644
--- a/app/cwm/calmwm.c
+++ b/app/cwm/calmwm.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: calmwm.c,v 1.78 2013/06/17 17:11:10 okan Exp $
+ * $OpenBSD: calmwm.c,v 1.79 2013/07/08 15:46:16 okan Exp $
*/
#include <sys/param.h>
@@ -102,7 +102,6 @@ main(int argc, char **argv)
conf_path = NULL;
}
-
conf_init(&Conf);
if (conf_path && (parse_config(conf_path, &Conf) == -1))
warnx("config file %s has errors, not loading", conf_path);
@@ -121,8 +120,7 @@ x_init(const char *dpyname)
int i;
if ((X_Dpy = XOpenDisplay(dpyname)) == NULL)
- errx(1, "unable to open display \"%s\"",
- XDisplayName(dpyname));
+ errx(1, "unable to open display \"%s\"", XDisplayName(dpyname));
XSetErrorHandler(x_wmerrorhandler);
XSelectInput(X_Dpy, DefaultRootWindow(X_Dpy), SubstructureRedirectMask);
diff --git a/app/cwm/xevents.c b/app/cwm/xevents.c
index 90eaee73e..c222e3eb2 100644
--- a/app/cwm/xevents.c
+++ b/app/cwm/xevents.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: xevents.c,v 1.85 2013/06/10 21:37:30 okan Exp $
+ * $OpenBSD: xevents.c,v 1.86 2013/07/08 15:46:16 okan Exp $
*/
/*
@@ -357,7 +357,7 @@ xev_handle_clientmessage(XEvent *ee)
client_send_delete(cc);
if (e->message_type == ewmh[_NET_ACTIVE_WINDOW].atom &&
- e->format == 32) {
+ e->format == 32) {
old_cc = client_current();
if (old_cc)
client_ptrsave(old_cc);