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 625f484e22dc118e94cd6d6039597721c830aadb..bd2e9395b523da13a415d2757038586c68291526 100644 (file)
--- 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 267d0148c463b4afbc99bd1b60e5072e5b9f5423..b250a20d66cb1b06b8a5b354eb4f6bbadaac2f11 100644 (file)
--- 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;