fix an uninit'd variable

[chiark-utils.git] / cprogs / xacpi-simple.c

diff --git a/cprogs/xacpi-simple.c b/cprogs/xacpi-simple.c
index cbbe292991714cb49ec6e5692b1ca455ae2c9695..f2ba491d93adbc41d8773eedf77b4564f90ece13 100644 (file)
--- a/cprogs/xacpi-simple.c
+++ b/cprogs/xacpi-simple.c
@@ -357,7 +357,7 @@ static double total_##f;
   ALL_ACCUMULATE_FIELDS(Q_VAR)
 
 static void acquiredata(void) {
   ALL_ACCUMULATE_FIELDS(Q_VAR)
 
 static void acquiredata(void) {

-  DIR *di;
+  DIR *di = 0;

   struct dirent *de;
   int r;
   
   struct dirent *de;
   int r;
   


@@ -427,7 +427,7 @@ ALL_PLAIN_ACCUMULATE_FIELDS(Q_ACCUMULATE_PLAIN)
 
       
   }
 
       
   }

-  closedir(di);
+  if (di) closedir(di);

 
   if (debug) {
     printf("TOTAL:\n");
 
   if (debug) {
     printf("TOTAL:\n");


@@ -467,17 +467,17 @@ static void initacquire(void) {
 /*---------- argument parsing ----------*/
 
 #define COLOURS                                        \
 /*---------- 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)
   GC(remain)                                   \
   GC(white)                                    \
   GC(empty)


@@ -763,15 +763,9 @@ static void refresh(void) {
 
 static void newgeometry(void) {
   int dummy;
 
 static void newgeometry(void) {
   int dummy;

-  unsigned int udummy, gotwidth, gotheight;

   Window dummyw;
   
   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) {
 }
 
 static void eventloop(void) {