summaryrefslogtreecommitdiff
path: root/onbld/debian/patches/bool.patch
blob: c05074168248c69187da2b9bb440b1bb410cdbe4 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
Index: b/usr/src/tools/cscope-fast/invlib.h
===================================================================
--- a/usr/src/tools/cscope-fast/invlib.h	2014-03-02 01:31:39.177314763 +0400
+++ b/usr/src/tools/cscope-fast/invlib.h	2014-03-02 01:31:43.146109749 +0400
@@ -88,7 +88,7 @@
 extern	int	nsrcoffset;	/* number of file name database offsets */
 
 extern void	boolclear(void);
-extern POSTING	*boolfile(INVCONTROL *invcntl, long *num, int bool);
+extern POSTING	*boolfile(INVCONTROL *invcntl, long *num, int op);
 extern void	invclose(INVCONTROL *invcntl);
 extern long	invfind(INVCONTROL *invcntl, char *searchterm);
 extern int	invforward(INVCONTROL *invcntl);
Index: b/usr/src/tools/cscope-fast/invlib.c
===================================================================
--- a/usr/src/tools/cscope-fast/invlib.c	2014-03-02 01:31:39.177366269 +0400
+++ b/usr/src/tools/cscope-fast/invlib.c	2014-03-02 01:31:43.148098328 +0400
@@ -948,7 +948,7 @@
 }
 
 POSTING *
-boolfile(INVCONTROL *invcntl, long *num, int bool)
+boolfile(INVCONTROL *invcntl, long *num, int op)
 {
 	ENTRY	*entryptr;
 	FILE	*file;
@@ -965,7 +965,7 @@
 	ptr2 = ((unsigned long *)ptr) +
 	    (entryptr->size + (sizeof (long) - 1)) / sizeof (long);
 	*num = entryptr->post;
-	switch (bool) {
+	switch (op) {
 	case OR:
 	case NOT:
 		if (*num == 0) {
@@ -975,7 +975,7 @@
 	}
 	/* make room for the new set */
 	u = 0;
-	switch (bool) {
+	switch (op) {
 	case AND:
 	case NOT:
 		newsetp = set1p = item;
@@ -1018,7 +1018,7 @@
 	(void) fseek(file, (long)*ptr2, SEEK_SET);
 	read_next_posting(invcntl, &posting);
 	newsetc = 0;
-	switch (bool) {
+	switch (op) {
 	case OR:
 		/* while something in both sets */
 		set1p = item;