X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scrotwm.c;h=ce0e0c23397d033b4931942d61489076a05e0c8f;hb=ee49baae878087781b57150deb83d7167e2983e2;hp=65f6551b374b5a8801f2c02993d9e2cdd5211894;hpb=b05bba3a0eb734161fb0fabfbaa921111cc96b70;p=spectrwm.git diff --git a/scrotwm.c b/scrotwm.c index 65f6551..ce0e0c2 100644 --- a/scrotwm.c +++ b/scrotwm.c @@ -122,9 +122,9 @@ XGCValues bar_gcv; XFontStruct *bar_fs; char bar_text[128]; char *bar_fonts[] = { - "-*-terminus-*-*-*-*-*-*-*-*-*-*-*-*", - "-*-times-medium-r-*-*-*-*-*-*-*-*-*-*", - NULL + "-*-terminus-*-*-*-*-*-*-*-*-*-*-*-*", + "-*-times-medium-r-*-*-*-*-*-*-*-*-*-*", + NULL }; /* terminal + args */ @@ -185,7 +185,6 @@ conf_load(char *filename) if ((line = fparseln(config, &len, &lineno, NULL, 0)) == NULL) if (feof(config)) break; - cp = line; cp += (long)strspn(cp, SWM_CONF_WS); if (cp[0] == '\0') { @@ -193,10 +192,8 @@ conf_load(char *filename) free(line); continue; } - if ((var = strsep(&cp, SWM_CONF_WS)) == NULL || cp == NULL) break; - cp += (long)strspn(cp, SWM_CONF_WS); if ((val = strsep(&cp, SWM_CONF_WS)) == NULL) break; @@ -238,7 +235,6 @@ conf_load(char *filename) default: goto bad; } - free(line); }