ALL_ACCUMULATE_FIELDS(Q_VAR)
static void acquiredata(void) {
- DIR *di;
+ DIR *di = 0;
struct dirent *de;
int r;
}
- closedir(di);
+ if (di) closedir(di);
if (debug) {
printf("TOTAL:\n");
/*---------- argument parsing ----------*/
#define COLOURS \
- C(blue, discharging) \
- C(green, charging) \
- C(cyan, charged) \
- C(lightgrey, notcharging) \
- C(grey, confusing) \
- C(black, normal) \
- C(red, low) \
- C(dimgrey, degraded) \
- C(darkgreen, absent) \
- C(yellow, error) \
- C(white, equilibrium) \
+ C(blue, discharging) \
+ C(green, charging) \
+ C(cyan, charged) \
+ C(lightgrey, notcharging) \
+ C(grey, confusing) \
+ C(black, normal) \
+ C(red, low) \
+ C(dimgrey, degraded) \
+ C(darkgreen, absent) \
+ C(yellow, error) \
+ C(white, equilibrium) \
GC(remain) \
GC(white) \
GC(empty)
static void newgeometry(void) {
int dummy;
- unsigned int udummy, gotwidth, gotheight;
Window dummyw;
- XGetGeometry(disp,win, &dummyw,&dummy,&dummy, &gotwidth,&gotheight,
- &udummy,&udummy);
- assert(gotwidth < INT_MAX);
- assert(gotheight < INT_MAX);
- width = gotwidth;
- height = gotheight;
+ XGetGeometry(disp,win, &dummyw,&dummy,&dummy, &width,&height, &dummy,&dummy);
}
static void eventloop(void) {