From: Reginald Kennedy <rk@rejii.com>
Date: Mon, 20 Aug 2012 17:18:47 +0000 (+0800)
Subject: In Linux Makefile, only set CC when it isn't already set.
X-Git-Tag: SPECTRWM_2_0_0~13
X-Git-Url: https://code.delx.au/spectrwm/commitdiff_plain/c03f2b39723401419d2a25d62f1b681128052259

In Linux Makefile, only set CC when it isn't already set.

Fix some uninitialized warnings.
---

diff --git a/linux/Makefile b/linux/Makefile
index 625f484..bd2e939 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -7,7 +7,7 @@ BINDIR?= $(PREFIX)/bin
 LIBDIR?= $(PREFIX)/lib
 MANDIR?= $(PREFIX)/share/man
 
-CC= gcc
+CC?= gcc
 
 LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor)
 
diff --git a/spectrwm.c b/spectrwm.c
index 267d014..b250a20 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -3523,7 +3523,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 	int			w_inc = 1, h_inc, w_base = 1, h_base;
 	int			hrh, extra = 0, h_slice, last_h = 0;
 	int			split, colno, winno, mwin, msize, mscale;
-	int			remain, missing, v_slice, reconfigure;
+	int			remain, missing, v_slice, reconfigure = 0;
 	int			bordered = 1;
 
 	DNPRINTF(SWM_D_STACK, "stack_master: workspace: %d, rot: %s, "
@@ -6564,7 +6564,7 @@ conf_load(char *filename, int keymapping)
 			    filename, lineno, wordlen, cp);
 			goto out;
 		}
-		if (keymapping && strcmp(opt->optname, "bind")) {
+		if (keymapping && opt && strcmp(opt->optname, "bind")) {
 			warnx("%s: line %zd: invalid option %.*s",
 			    filename, lineno, wordlen, cp);
 			goto out;