This commit is contained in:
Marco Peereboom 2009-01-14 17:14:05 +00:00
parent b05bba3a0e
commit ee49baae87

View file

@ -122,9 +122,9 @@ XGCValues bar_gcv;
XFontStruct *bar_fs; XFontStruct *bar_fs;
char bar_text[128]; char bar_text[128];
char *bar_fonts[] = { char *bar_fonts[] = {
"-*-terminus-*-*-*-*-*-*-*-*-*-*-*-*", "-*-terminus-*-*-*-*-*-*-*-*-*-*-*-*",
"-*-times-medium-r-*-*-*-*-*-*-*-*-*-*", "-*-times-medium-r-*-*-*-*-*-*-*-*-*-*",
NULL NULL
}; };
/* terminal + args */ /* terminal + args */
@ -185,7 +185,6 @@ conf_load(char *filename)
if ((line = fparseln(config, &len, &lineno, NULL, 0)) == NULL) if ((line = fparseln(config, &len, &lineno, NULL, 0)) == NULL)
if (feof(config)) if (feof(config))
break; break;
cp = line; cp = line;
cp += (long)strspn(cp, SWM_CONF_WS); cp += (long)strspn(cp, SWM_CONF_WS);
if (cp[0] == '\0') { if (cp[0] == '\0') {
@ -193,10 +192,8 @@ conf_load(char *filename)
free(line); free(line);
continue; continue;
} }
if ((var = strsep(&cp, SWM_CONF_WS)) == NULL || cp == NULL) if ((var = strsep(&cp, SWM_CONF_WS)) == NULL || cp == NULL)
break; break;
cp += (long)strspn(cp, SWM_CONF_WS); cp += (long)strspn(cp, SWM_CONF_WS);
if ((val = strsep(&cp, SWM_CONF_WS)) == NULL) if ((val = strsep(&cp, SWM_CONF_WS)) == NULL)
break; break;
@ -238,7 +235,6 @@ conf_load(char *filename)
default: default:
goto bad; goto bad;
} }
free(line); free(line);
} }