Update from 1.4.1 to 1.4.2 (bugfix release)
This commit is contained in:
parent
a36bbfc2f0
commit
6b26437650
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=157477
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= uuid
|
||||
PORTVERSION= 1.4.1
|
||||
PORTVERSION= 1.4.2
|
||||
CATEGORIES= misc devel
|
||||
MASTER_SITES= ${MASTER_SITE_OSSP}
|
||||
MASTER_SITE_SUBDIR= lib/${PORTNAME}
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (uuid-1.4.1.tar.gz) = a58fa33d4403b78dc6a2a7d649f4125e
|
||||
SHA256 (uuid-1.4.1.tar.gz) = 45de9a35f8c097925f99e9f899586d1f19705d8531fc4a33a62ccdbff1095446
|
||||
SIZE (uuid-1.4.1.tar.gz) = 388134
|
||||
MD5 (uuid-1.4.2.tar.gz) = fdfe93bc134dfb73814456c3b444dda1
|
||||
SHA256 (uuid-1.4.2.tar.gz) = a8d4723b45a90e85c2250123a634cd00ea1912e79737c71c593fd78b1413176e
|
||||
SIZE (uuid-1.4.2.tar.gz) = 390542
|
||||
|
@ -1,32 +0,0 @@
|
||||
--- uuid_str.c.orig Tue Mar 29 21:39:51 2005
|
||||
+++ uuid_str.c Thu Dec 8 18:46:13 2005
|
||||
@@ -690,8 +690,10 @@
|
||||
{
|
||||
char *rv;
|
||||
int n;
|
||||
+ va_list ap_tmp;
|
||||
|
||||
- n = str_vsnprintf(NULL, 0, fmt, ap);
|
||||
+ va_copy(ap_tmp, ap);
|
||||
+ n = str_vsnprintf(NULL, 0, fmt, ap_tmp);
|
||||
if ((rv = (char *)malloc(n+1)) == NULL)
|
||||
return NULL;
|
||||
str_vsnprintf(rv, n+1, fmt, ap);
|
||||
@@ -720,6 +722,7 @@
|
||||
{
|
||||
int rv;
|
||||
size_t n;
|
||||
+ va_list ap_tmp;
|
||||
|
||||
if (str == NULL)
|
||||
return -1;
|
||||
@@ -729,7 +732,8 @@
|
||||
}
|
||||
else {
|
||||
n = strlen(*str);
|
||||
- rv = str_vsnprintf(NULL, 0, fmt, ap);
|
||||
+ va_copy(ap_tmp, ap);
|
||||
+ rv = str_vsnprintf(NULL, 0, fmt, ap_tmp);
|
||||
if ((*str = (char *)realloc(*str, n+rv+1)) == NULL)
|
||||
return -1;
|
||||
str_vsnprintf((*str)+n, rv+1, fmt, ap);
|
Loading…
Reference in New Issue
Block a user