about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2023-09-28 21:45:08 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2023-09-28 21:45:08 +0000
commitcf79c8afa7c3982219b2493254e26390bbdab3b8 (patch)
tree36d914b061818824aa65da12df4c877f8dfab0e5
parent34546ecb9b586f34e04f6e133a247ffe1f50046e (diff)
downloadnetpbm-mirror-cf79c8afa7c3982219b2493254e26390bbdab3b8.tar.gz
netpbm-mirror-cf79c8afa7c3982219b2493254e26390bbdab3b8.tar.xz
netpbm-mirror-cf79c8afa7c3982219b2493254e26390bbdab3b8.zip
Release 11.04.01
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@4705 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY5
-rw-r--r--lib/util/nstring.c4
-rw-r--r--version.mk2
3 files changed, 8 insertions, 3 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index a0b1a61b..9e872a35 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,11 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+23.09.28 BJH  Release 11.04.01
+
+              Fix compile error on systems without 'asprintf'.  Introduced
+              in Netpbm 11.04 (yesterday).
+
 23.09.27 BJH  Release 11.04.00
 
               pamaddnoise: add -salt.
diff --git a/lib/util/nstring.c b/lib/util/nstring.c
index 623fd7b7..29da8fe5 100644
--- a/lib/util/nstring.c
+++ b/lib/util/nstring.c
@@ -84,7 +84,7 @@ pm_asprintf(const char ** const resultP,
 
     va_start(varargs, fmt);
 
-    vsnprintf(NULL, 0, fmt, varargs, &dryRunLen);
+    dryRunLen = vsnprintf(NULL, 0, fmt, varargs);
 
     va_end(varargs);
 
@@ -101,7 +101,7 @@ pm_asprintf(const char ** const resultP,
 
             va_start(varargs, fmt);
 
-            vsnprintf(buffer, allocSize, fmt, varargs, &realLen);
+            realLen = vsnprintf(buffer, allocSize, fmt, varargs);
 
             assert(realLen == dryRunLen);
             va_end(varargs);
diff --git a/version.mk b/version.mk
index fca21779..72549b67 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 11
 NETPBM_MINOR_RELEASE = 4
-NETPBM_POINT_RELEASE = 0
+NETPBM_POINT_RELEASE = 1