Attachment #252779 for bug #280832

View | Details | Raw Unified | Return to bug 280832
Collapse All | Expand All

Lines 1-6 Link Here

(-)b/www/tdom/Makefile (-3 / +2 lines)
1	PORTNAME= tDOM	1	PORTNAME= tDOM
2	PORTVERSION= 0.9.3	2	PORTVERSION= 0.9.4
3	PORTREVISION= 1
4	CATEGORIES= www	3	CATEGORIES= www
5	MASTER_SITES= http://tdom.org/downloads/	4	MASTER_SITES= http://tdom.org/downloads/
6	DISTNAME= ${PORTNAME:tl}-${PORTVERSION}-src	5	DISTNAME= ${PORTNAME:tl}-${PORTVERSION}-src
Lines 48-54 MAKE_ARGS+= RANLIB_STUB=: Link Here
48		47
49	.if ${PORT_OPTIONS:MEBASE}	48	.if ${PORT_OPTIONS:MEBASE}
50	post-patch:	49	post-patch:
51	${REINPLACE_CMD} 's\|expat\.h\|bsdxml.h\|g' \	50	${REINPLACE_CMD} 's\|$[</]$expat\.h\|\1bsdxml.h\|g' \
52	${WRKSRC}/configure \	51	${WRKSRC}/configure \
53	${WRKSRC}/generic/dom.h \	52	${WRKSRC}/generic/dom.h \
54	${WRKSRC}/generic/tdom.h \	53	${WRKSRC}/generic/tdom.h \

Lines 1-3 Link Here

(-)b/www/tdom/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1704653401	1	TIMESTAMP = 1723737191
2	SHA256 (tdom-0.9.3-src.tar.gz) = b46bcb6750283bcf41bd6f220cf06e7074752dc8b9a87a192bd81e53caad53f9	2	SHA256 (tdom-0.9.4-src.tar.gz) = f947d38cbb7978ec1510e3cf894a672a4ad18cb823b8c9bb3604934ebe4c4546
3	SIZE (tdom-0.9.3-src.tar.gz) = 1319804	3	SIZE (tdom-0.9.4-src.tar.gz) = 1447298

Lines 1-10 Link Here

(-)b/www/tdom/files/patch-generic-dom.h (-3 / +4 lines)
1	--- generic/dom.h.orig 2018-09-24 12:17:05.706742000 +0000	1	--- generic/dom.h 2018-09-24 12:17:05.706742000 +0000
2	+++ generic/dom.h 2018-09-24 12:17:16.003866000 +0000	2	+++ generic/dom.h 2024-08-15 12:03:29.000000000 -0400
3	@@ -41,7 +41,6 @@	3	@@ -41,8 +41,7 @@
4	#include <string.h>	4	#include <string.h>
5	#include <ctype.h>	5	#include <ctype.h>
6	#include <expat.h>	6	#include <expat.h>
7	-#include <domalloc.h>	7	-#include <domalloc.h>
		8	#include <limits.h>
8		9
9	/*	10	/*
10	* tDOM provides it's own memory allocator which is optimized for	11	* tDOM provides it's own memory allocator which is optimized for




Remove the set-but-unused variable (nHash). Pointed out by
clang...

	-mi

--- generic/domxslt.c	2024-07-25 20:20:32.000000000 -0400
+++ generic/domxslt.c	2024-08-15 12:08:27.351920000 -0400
@@ -1152,5 +1152,5 @@
     char wrongFormat[] = "Unable to interpret format pattern.";
     domLength l, zl, gLen;
-    int i, j, k, g, nHash, nZero, fHash, fZero, isNeg;
+    int i, j, k, g, nZero, fHash, fZero, isNeg;
     int prefixMinux, percentMul = 0, perMilleMul = 0;
     Tcl_DString  dStr, s;
@@ -1219,5 +1219,5 @@
     }
     prefix1[i] = '\0';
-    nHash = nZero = fHash = fZero = 0;
+    nZero = fHash = fZero = 0;
     gLen = -2222;
     while (*p) {
@@ -1227,5 +1227,4 @@
                 goto xsltFormatNumberError;
             }
-            nHash++; 
         }
         else if (*p==df->zeroDigit) { nZero++; }

Return to bug 280832

Added Link Here

(-)b/www/tdom/files/patch-warnings (+27 lines)
1	Remove the set-but-unused variable (nHash). Pointed out by
2	clang...
3
4	-mi
5
6	--- generic/domxslt.c 2024-07-25 20:20:32.000000000 -0400
7	+++ generic/domxslt.c 2024-08-15 12:08:27.351920000 -0400
8	@@ -1152,5 +1152,5 @@
9	char wrongFormat[] = "Unable to interpret format pattern.";
10	domLength l, zl, gLen;
11	- int i, j, k, g, nHash, nZero, fHash, fZero, isNeg;
12	+ int i, j, k, g, nZero, fHash, fZero, isNeg;
13	int prefixMinux, percentMul = 0, perMilleMul = 0;
14	Tcl_DString dStr, s;
15	@@ -1219,5 +1219,5 @@
16	}
17	prefix1[i] = '\0';
18	- nHash = nZero = fHash = fZero = 0;
19	+ nZero = fHash = fZero = 0;
20	gLen = -2222;
21	while (*p) {
22	@@ -1227,5 +1227,4 @@
23	goto xsltFormatNumberError;
24	}
25	- nHash++;
26	}
27	else if (*p==df->zeroDigit) { nZero++; }