From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 6 Jun 2012 00:47:17 +0000 (+0100)
Subject: do not placate -Wpointer-sign
X-Git-Tag: debian/4.1.31~18
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=2e8778a4f845d16f601f2754de11c71ef570d33a

do not placate -Wpointer-sign
---

diff --git a/cprogs/xacpi-simple.c b/cprogs/xacpi-simple.c
index a7b584c..70949b9 100644
--- a/cprogs/xacpi-simple.c
+++ b/cprogs/xacpi-simple.c
@@ -763,15 +763,9 @@ static void refresh(void) {
 
 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) {
diff --git a/debian/changelog b/debian/changelog
index 94cb30c..5c5ee0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,6 @@ chiark-utils (4.1.31~~iwj) unstable; urgency=low
     - Option -debug produces some debugging output.
     - In the code, rename pix_... variables to be named after the meaning
       rather than the default colour.
-    - Get rid of some signed/unsigned warnings.
 
   * Fix the build-depends to refer to nettle-dev not libnettle-dev.
   * Add ${misc:Depends} to Depends: lines.  Causes no change to the .debs.