aboutsummaryrefslogtreecommitdiffstats
path: root/calmwm.c
diff options
context:
space:
mode:
authorokan2013-07-08 15:46:16 +0000
committerokan2013-07-08 15:46:16 +0000
commit72d22295d234444996cb86245dcc179e24adc895 (patch)
treeb73db473f411579510a9f7fa817be6cbdbb4ee86 /calmwm.c
parent3a12b3bd01607a277de11b89a622f906055090a7 (diff)
downloadcwm-72d22295d234444996cb86245dcc179e24adc895.tar.gz
whitespace and style fixes; from Tiago Cunha and one from me.
Diffstat (limited to 'calmwm.c')
-rw-r--r--calmwm.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/calmwm.c b/calmwm.c
index 6a6d01b..4fc641d 100644
--- a/calmwm.c
+++ b/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);