From 5f66b4d08a96e0effeed6b84c73bb0d82edceefa Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 2 Jun 2012 13:29:36 +0100
Subject: [PATCH] fix unused vars

---
 base/idtable.c   | 2 --
 debian/changelog | 5 +++--
 hbytes/hook.c    | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/base/idtable.c b/base/idtable.c
index ae175b6..6e7aafa 100644
--- a/base/idtable.c
+++ b/base/idtable.c
@@ -77,14 +77,12 @@ int cht_tabledataid_parse(Tcl_Interp *ip, Tcl_Obj *o, const IdDataSpec *idds) {
   int l;
   unsigned long ul;
   IdDataValue *dv;
-  IdDataAssocData *assoc;
   char *ep, *str;
 
   if (o->typePtr != &cht_tabledataid_nearlytype) goto convert;
 
   dv= o->internalRep.otherValuePtr;
   if (dv->interp != ip) goto convert;
-  assoc= dv->assoc;
   if (dv->assoc->idds != idds) goto convert;
 
   return TCL_OK;
diff --git a/debian/changelog b/debian/changelog
index f24075a..00ec696 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,14 @@
 chiark-tcl (1.1.1~~iwj) unstable; urgency=low
 
   Bugfix:
-  * Handling of errors reading /dev/urandom fixed.  (Also, fixes
-    FTBFS in sid due to warning from recent versions of gcc.)
+  * Handling of errors reading /dev/urandom fixed.
 
   User-visible change:
   * Mention dgram, tuntap and maskmap in Description.  Fix typo.
 
   Packaging improvements:
+  * Fix FTBFS in sid due to warning from recent versions of gcc
+    about set but not used variables.
   * Update default TCL_VERSION for upstream build to 8.4.
   * Remove the pointless copyright notice from the end of the changelog.
   * Add ${misc:Depends} to Depends field (has no effect on the .deb).
diff --git a/hbytes/hook.c b/hbytes/hook.c
index 254b4fe..f570709 100644
--- a/hbytes/hook.c
+++ b/hbytes/hook.c
@@ -96,8 +96,8 @@ static void hbytes_t_ustr(Tcl_Obj *o) {
 }
 
 static int hbytes_t_sfa(Tcl_Interp *ip, Tcl_Obj *o) {
-  char *str, *ep, *os;
-  Byte *startbytes, *bytes;
+  char *str, *ep;
+  Byte *bytes;
   int l;
   char cbuf[3];
 
@@ -109,13 +109,13 @@ static int hbytes_t_sfa(Tcl_Interp *ip, Tcl_Obj *o) {
 
   } else {
   
-    os= str= Tcl_GetStringFromObj(o,&l);  assert(str);
+    str= Tcl_GetStringFromObj(o,&l);  assert(str);
     cht_objfreeir(o);
 
     if (l & 1) return cht_staticerr(ip, "hbytes: conversion from hex:"
 				" odd length in hex", "HBYTES SYNTAX");
 
-    startbytes= bytes= cht_hb_arrayspace(OBJ_HBYTES(o), l/2);
+    bytes= cht_hb_arrayspace(OBJ_HBYTES(o), l/2);
 
     cbuf[2]= 0;
     while (l>0) {
-- 
2.30.2