From de0e88735cf70a6e88a8332399478411e4911598 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 5 Oct 2015 00:46:28 +0000
Subject:  - Fix double macro expansion bug in cbuffer_get* and cbuffer_put*  -
 rc for 2.3.7.1

---
 doc/index.html               | 2 +-
 doc/upgrade.html             | 6 ++++++
 package/info                 | 2 +-
 src/libstddjb/cbuffer_get.c  | 4 +++-
 src/libstddjb/cbuffer_getv.c | 4 +++-
 src/libstddjb/cbuffer_put.c  | 4 +++-
 src/libstddjb/cbuffer_putv.c | 4 +++-
 7 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/doc/index.html b/doc/index.html
index 2ee91ce..f97bf25 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -60,7 +60,7 @@ with a standard C development environment </li>
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of skalibs is <a href="skalibs-2.3.7.0.tar.gz">2.3.7.0</a>. </li>
+ <li> The current released version of skalibs is <a href="skalibs-2.3.7.1.tar.gz">2.3.7.1</a>. </li>
  <li> Alternatively, you can checkout a copy of the skalibs git repository:
 <pre> git clone git://git.skarnet.org/skalibs </pre> </li>
 </ul>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 6058dda..d445290 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,12 @@
 
 <h1> What has changed in skalibs </h1>
 
+<h2> in 2.3.7.1 </h2>
+
+<ul>
+ <li> No functional changes. </li>
+</ul>
+
 <h2> in 2.3.7.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 8c8825f..d7ed139 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=skalibs
-version=2.3.7.0
+version=2.3.7.1
 category=prog
 package_macro_name=SKALIBS
diff --git a/src/libstddjb/cbuffer_get.c b/src/libstddjb/cbuffer_get.c
index 544cbb2..d322a03 100644
--- a/src/libstddjb/cbuffer_get.c
+++ b/src/libstddjb/cbuffer_get.c
@@ -6,6 +6,8 @@
 unsigned int cbuffer_get (cbuffer_t *b, char *s, unsigned int len)
 {
   siovec_t v[2] ;
+  register unsigned int w ;
   cbuffer_rpeek(b, v) ;
-  return cbuffer_RSEEK(b, siovec_gather(v, 2, s, len)) ;
+  w = siovec_gather(v, 2, s, len) ;
+  return cbuffer_RSEEK(b, w) ;
 }
diff --git a/src/libstddjb/cbuffer_getv.c b/src/libstddjb/cbuffer_getv.c
index 3db638f..22bd6f7 100644
--- a/src/libstddjb/cbuffer_getv.c
+++ b/src/libstddjb/cbuffer_getv.c
@@ -6,6 +6,8 @@
 unsigned int cbuffer_getv (cbuffer_t *b, siovec_t const *v, unsigned int n)
 {
   siovec_t vsrc[2] ;
+  register unsigned int w ;
   cbuffer_rpeek(b, vsrc) ;
-  return cbuffer_RSEEK(b, siovec_deal(v, n, vsrc, 2)) ;
+  w = siovec_deal(v, n, vsrc, 2) ;
+  return cbuffer_RSEEK(b, w) ;
 }
diff --git a/src/libstddjb/cbuffer_put.c b/src/libstddjb/cbuffer_put.c
index 12f513e..5733d21 100644
--- a/src/libstddjb/cbuffer_put.c
+++ b/src/libstddjb/cbuffer_put.c
@@ -6,6 +6,8 @@
 unsigned int cbuffer_put (cbuffer_t *b, char const *s, unsigned int len)
 {
   siovec_t v[2] ;
+  register unsigned int w ;
   cbuffer_wpeek(b, v) ;
-  return cbuffer_WSEEK(b, siovec_scatter(v, 2, s, len)) ;
+  w = siovec_scatter(v, 2, s, len) ;
+  return cbuffer_WSEEK(b, w) ;
 }
diff --git a/src/libstddjb/cbuffer_putv.c b/src/libstddjb/cbuffer_putv.c
index 66bed05..6a914de 100644
--- a/src/libstddjb/cbuffer_putv.c
+++ b/src/libstddjb/cbuffer_putv.c
@@ -6,6 +6,8 @@
 unsigned int cbuffer_putv (cbuffer_t *b, siovec_t const *v, unsigned int n)
 {
   siovec_t vdest[2] ;
+  register unsigned int w ;
   cbuffer_wpeek(b, vdest) ;
-  return cbuffer_WSEEK(b, siovec_deal(vdest, 2, v, n)) ;
+  w = siovec_deal(vdest, 2, v, n) ;
+  return cbuffer_WSEEK(b, w) ;
 }
-- 
cgit v1.2.3