head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.112
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.110
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.108
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.106
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.104
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.102
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.100
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.98
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.96
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.94
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.92
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.90
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.88
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.86
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.84
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.82
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.80
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.78
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.76
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.74
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.72
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.70
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.68
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.64
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.44
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.66
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.62
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.60
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.58
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.56
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.54
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.52
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.50
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.48
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.46
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.42
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.40
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.38
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.36
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.34
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.32
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.30
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.28
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.26
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.24
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.22
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.20
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.18
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.16
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.14
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.12
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.10
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.8
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.6
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.4
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.2
	pkgsrc-2012Q2-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2012.05.10.20.53.30;	author dholland;	state Exp;
branches;
next	;


desc
@@


1.1
log
@Pass -Wall. Fix a number of minor bugs and possibly some major ones.
Should also fix clang build. PKGREVISION++
@
text
@$NetBSD$

- silence initialization warning seen with gcc 4.1
- fix mixing of signed and unsigned char pointers
- silence gcc braces and parentheses warnings

--- src/search.c~	2012-05-10 19:25:36.000000000 +0000
+++ src/search.c
@@@@ -255,6 +255,10 @@@@ int repeats;
 	int	patlenadd;
 	int	jump;
 
+	/* required by gcc 4.1  */
+	patlenadd = 0;
+	jump = 0;
+
 	/* If we are going in reverse, then the 'end' is actually
 	 * the beginning of the pattern.  Toggle it.
 	 */
@@@@ -410,7 +414,7 @@@@ int *pcwoff;
 		/* Is the current meta-character modified
 		 * by a closure?
 		 */
-		if (cl_type = (mcptr->mc_type & ALLCLOS)) {
+		if ((cl_type = (mcptr->mc_type & ALLCLOS)) != 0) {
 
 			/* Minimum number of characters that may
 			 * match is 0 or 1.
@@@@ -807,7 +811,7 @@@@ DELTA *tbl;
  */
 VOID PASCAL NEAR setjtable()
 {
-	make_delta(pat, &deltapat);
+	make_delta((char *)pat, &deltapat);
 	make_delta(strrev(strcpy((char *)tap, (char *)pat)), &tapatled);
 }
 
@@@@ -876,13 +880,14 @@@@ int srch;
 	/* Only make the meta-pattern if in magic mode, since the
 	 * pattern in question might have an invalid meta combination.
 	 */
-	if (status == TRUE)
+	if (status == TRUE) {
 		if ((curwp->w_bufp->b_mode & MDMAGIC) == 0) {
 			mcclear();
 			rmcclear();
 		}
 		else
 			status = srch? mcstr(): rmcstr();
+	}
 #endif
 	return (status);
 }
@@@@ -1500,7 +1505,7 @@@@ MC *mcptr;
 	 * Now loop through the pattern, collecting characters until
 	 * we run into a meta-character.
 	 */
-	while (pchr = *++patptr)
+	while ((pchr = *++patptr) != 0)
 	{
 		/*
 		 * If the current character is a closure character,
@