--- a/packages/infra/current/ChangeLog
+++ b/packages/infra/current/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-06  Grant Edwards  <grant.b.edwards@gmail.com>
+	
+	* src/diag.cxx: Fix compiler warnings about variables that are set
+	but never read. [ Bugzilla 1001503 ]
+
 2010-09-13  Chris Holgate  <chris@zynaptic.com>
 
 	* include/diag.h:

--- a/packages/infra/current/src/diag.cxx
+++ b/packages/infra/current/src/diag.cxx
@@ -522,7 +522,6 @@ static void
 int
 diag_sprintf(char *buf, const char *fmt, ...)
 {        
-    int ret;
     va_list ap;
     struct _sputc_info info;
 
@@ -530,15 +529,14 @@ diag_sprintf(char *buf, const char *fmt,
     info.ptr = buf;
     info.max = 1024;  // Unlimited
     info.len = 0;
-    ret = _vprintf(_sputc, (void **)&info, fmt, ap);
+    _vprintf(_sputc, (void **)&info, fmt, ap);
     va_end(ap);
-    return (info.len);
+    return info.len;
 }
 
 int
 diag_snprintf(char *buf, size_t len, const char *fmt, ...)
 {        
-    int ret;
     va_list ap;
     struct _sputc_info info;
 
@@ -546,7 +544,7 @@ diag_snprintf(char *buf, size_t len, con
     info.ptr = buf;
     info.len = 0;
     info.max = len-1;
-    ret = _vprintf(_sputc, (void **)&info, fmt, ap);
+    _vprintf(_sputc, (void **)&info, fmt, ap);
     va_end(ap);
     return (info.len);
 }
@@ -554,26 +552,24 @@ diag_snprintf(char *buf, size_t len, con
 int 
 diag_vsprintf(char *buf, const char *fmt, va_list ap)
 {
-    int ret;
     struct _sputc_info info;
 
     info.ptr = buf;
     info.max = 1024;  // Unlimited
     info.len = 0;
-    ret = _vprintf(_sputc, (void **)&info, fmt, ap);
+    _vprintf(_sputc, (void **)&info, fmt, ap);
     return (info.len);
 }
 
 int 
 diag_vsnprintf(char *buf, size_t len, const char *fmt, va_list ap)
 {
-    int ret;
     struct _sputc_info info;
 
     info.ptr = buf;
     info.max = len-1;  
     info.len = 0;
-    ret = _vprintf(_sputc, (void **)&info, fmt, ap);
+    _vprintf(_sputc, (void **)&info, fmt, ap);
     return (info.len);
 }