more of the same

source/find.c

@@ -144,7 +144,9 @@ static bool check_for_assignment(void) {
 		if(asgn_char[0] == '\0') {
 			/* get the next block when we reach the end of
 			 * the current block */
-			if(NULL == (asgn_char = read_block())) return false;
+			if(NULL == (asgn_char = read_block())){
+				return false;
+			}
 		}
 	}
 	/* check for digraph starting with = */
@@ -159,12 +161,13 @@ static bool check_for_assignment(void) {
 	}
 
 	/* check for operator assignments: +=, ... ^= ? */
-	if(((asgn_char[0] == '+') || (asgn_char[0] == '-') || (asgn_char[0] == '*') ||
+	if((asgn_char[1] == '=')
+	    || ((asgn_char[1] & 0x80)
+	       && (dichar1[(asgn_char[1] & 0177) / 8] == '='))
+	&&
+	((asgn_char[0] == '+') || (asgn_char[0] == '-') || (asgn_char[0] == '*') ||
 		   (asgn_char[0] == '/') || (asgn_char[0] == '%') || (asgn_char[0] == '&') ||
-		   (asgn_char[0] == '|') || (asgn_char[0] == '^')) &&
-		((asgn_char[1] == '=') ||
-			((asgn_char[1] & 0x80) && (dichar1[(asgn_char[1] & 0177) / 8] == '=')))
-
+		   (asgn_char[0] == '|') || (asgn_char[0] == '^'))
 	) {
 		return true;
 	}
@@ -173,8 +176,10 @@ static bool check_for_assignment(void) {
 	if(((asgn_char[0] == '<') || (asgn_char[0] == '>')) &&
 		(asgn_char[1] == asgn_char[0]) &&
 		((asgn_char[2] == '=') ||
-			((asgn_char[2] & 0x80) && (dichar1[(asgn_char[2] & 0177) / 8] == '='))))
+			((asgn_char[2] & 0x80) && (dichar1[(asgn_char[2] & 0177) / 8] == '=')))
+	) {
 		return true;
+	}
 	return false;
 }
 
@@ -205,7 +210,7 @@ static char *find_symbol_or_assignment(const char *pattern, bool assign_flag) {
 		return NULL;
 	}
 
-	(void)scanpast('\t');	  /* find the end of the header */
+	scanpast('\t');	  /* find the end of the header */
 	skiprefchar();			  /* skip the file marker */
 	fetch_string_from_dbase(file, sizeof(file));
 	strcpy(function, global); /* set the dummy global function name */
@@ -422,7 +427,6 @@ char *finddef(const char *pattern) {
 }
 
 /* find all function definitions (used by samuel only) */
-
 char *findallfcns(const char *dummy) {
 	char file[PATHLEN + 1];	   /* source file name */
 	char function[PATLEN + 1]; /* function name */
@@ -589,9 +593,9 @@ char *findregexp(const char *egreppat) {
 /* find matching file names */
 
 char *findfile(const char *dummy) {
-	unsigned int i;
+	UNUSED(dummy);
 
-	(void)dummy; /* unused argument */
+	unsigned int i;
 
 	for(i = 0; i < nsrcfiles; ++i) {
 		char *s;
@@ -706,7 +710,7 @@ int findinit(const char *pattern_) {
 		   characters) on a database not built with -T */
 		if(trun_syms == true && isuptodate == true && dbtruncated == false &&
 			s - pattern >= 8) {
-			(void)strcpy(pattern + 8, ".*");
+			strcpy(pattern + 8, ".*");
 			isregexp = true;
 		}
 	}
@@ -717,8 +721,8 @@ int findinit(const char *pattern_) {
 		/* remove a leading ^ */
 		s = pattern;
 		if(*s == '^') {
-			(void)strcpy(newpat, s + 1);
-			(void)strcpy(s, newpat);
+			strcpy(newpat, s + 1);
+			strcpy(s, newpat);
 		}
 		/* remove a trailing $ */
 		i = strlen(s) - 1;
@@ -731,7 +735,7 @@ int findinit(const char *pattern_) {
 		/* must be an exact match */
 		/* note: regcomp doesn't recognize ^*keypad$ as a syntax error
 				 unless it is given as a single arg */
-		(void)snprintf(buf, sizeof(buf), "^%s$", s);
+		snprintf(buf, sizeof(buf), "^%s$", s);
 		if(regcomp(&regexp, buf, REG_EXTENDED | REG_NOSUB) != 0) {
 			r = REGCMPERROR;
 			goto end;
@@ -807,7 +811,7 @@ static void putref(int seemore, const char *file, const char *func) {
 	} else {
 		output = nonglobalrefs;
 	}
-	(void)fprintf(output, "%s %s ", file, func);
+	fprintf(output, "%s %s ", file, func);
 	putsource(seemore, output);
 }
 
@@ -819,9 +823,9 @@ static void putsource(int seemore, FILE *output) {
 	bool  Change = false, retreat = false;
 
 	if(fileversion <= 5) {
-		(void)scanpast(' ');
+		scanpast(' ');
 		putline(output);
-		(void)putc('\n', output);
+		putc('\n', output);
 		return;
 	}
 	/* scan back to the beginning of the source line */
@@ -831,7 +835,7 @@ static void putsource(int seemore, FILE *output) {
 		if(--cp < block) {
 			retreat = true;
 			/* read the previous block */
-			(void)dbseek((blocknumber - 1) * BUFSIZ);
+			dbseek((blocknumber - 1) * BUFSIZ);
 			cp = block + (BUFSIZ - 1);
 		}
 	}
@@ -860,7 +864,7 @@ static void putsource(int seemore, FILE *output) {
 		putline(output);
 		if(retreat == true) retreat = false;
 	} while(blockp != NULL && getrefchar() != '\n');
-	(void)putc('\n', output);
+	putc('\n', output);
 	if(Change == true) blockp = cp;
 }
 
@@ -878,16 +882,16 @@ static void putline(FILE *output) {
 			/* check for a compressed digraph */
 			if(c > '\177') {
 				c &= 0177;
-				(void)putc(dichar1[c / 8], output);
-				(void)putc(dichar2[c & 7], output);
+				putc(dichar1[c / 8], output);
+				putc(dichar2[c & 7], output);
 			}
 			/* check for a compressed keyword */
 			else if(c < ' ') {
-				(void)fputs(keyword[c].text, output);
-				if(keyword[c].delim != '\0') { (void)putc(' ', output); }
-				if(keyword[c].delim == '(') { (void)putc('(', output); }
+				fputs(keyword[c].text, output);
+				if(keyword[c].delim != '\0') { putc(' ', output); }
+				if(keyword[c].delim == '(') { putc('(', output); }
 			} else {
-				(void)putc((int)c, output);
+				putc((int)c, output);
 			}
 			++cp;
 		}
@@ -935,11 +939,10 @@ char *scanpast(char c) {
 	} while(*(cp + 1) == '\0' && (cp = read_block()) != NULL);
 	blockp = cp;
 	if(cp != NULL) { skiprefchar(); /* skip the found character */ }
-	return (blockp);
+	return blockp;
 }
 
 /* read a block of the cross-reference */
-/* HBB 20040430: renamed from readblock(), to avoid name clash on QNX */
 char *read_block(void) {
 	/* read the next block */
 	blocklen = read(symrefs, block, BUFSIZ);
@@ -972,16 +975,10 @@ static char *lcasify(const char *s) {
 }
 
 /* find the functions called by this function */
-
-/* HBB 2000/05/05: for consitency of calling interface between the
- * different 'find...()' functions, this now returns a char pointer,
- * too. Implemented as a pointer to static storage containing 'y' or
- * 'n', for the boolean result values true and false */
-
 char *findcalledby(const char *pattern) {
-	char		file[PATHLEN + 1];	/* source file name */
-	static char found_caller = 'n'; /* seen calling function? */
-	bool		macro		 = false;
+	char   file[PATHLEN + 1];	/* source file name */
+	char * found_caller = NULL; /* seen calling function? */
+	bool   macro        = false;
 
 	if(invertedindex == true) {
 		POSTING *p;
@@ -993,12 +990,12 @@ char *findcalledby(const char *pattern) {
 				case FCNDEF:
 					if(dbseek(p->lineoffset) != -1 &&
 						scanpast('\t') != NULL) { /* skip def */
-						found_caller = 'y';
+						found_caller = 0x01;
 						findcalledbysub(srcfiles[p->fileindex], macro);
 					}
 			}
 		}
-		return (&found_caller);
+		return found_caller;
 	}
 	/* find the function definition(s) */
 	while(scanpast('\t') != NULL) {
@@ -1008,7 +1005,7 @@ char *findcalledby(const char *pattern) {
 				skiprefchar();		/* save file name */
 				fetch_string_from_dbase(file, sizeof(file));
 				if(*file == '\0') { /* if end of symbols */
-					return (&found_caller);
+					return found_caller;
 				}
 				progress("Search", searchcount, nsrcfiles);
 				break;
@@ -1021,14 +1018,14 @@ char *findcalledby(const char *pattern) {
 			case FCNDEF:
 				skiprefchar(); /* match name to pattern */
 				if(match()) {
-					found_caller = 'y';
+					found_caller = 0x01;
 					findcalledbysub(file, macro);
 				}
 				break;
 		}
 	}
 
-	return (&found_caller);
+	return found_caller;
 }
 
 /* find this term, which can be a regular expression */
@@ -1044,7 +1041,7 @@ static void findterm(const char *pattern) {
 	boolclear();	   /* clear the posting set */
 
 	/* get the string prefix (if any) of the regular expression */
-	(void)strcpy(prefix, pattern);
+	strcpy(prefix, pattern);
 	if((s = strpbrk(prefix, ".[{*+")) != NULL) { *s = '\0'; }
 	/* if letter case is to be ignored */
 	if(caseless == true) {
@@ -1058,16 +1055,16 @@ static void findterm(const char *pattern) {
 		}
 	}
 	/* find the term lexically >= the prefix */
-	(void)invfind(&invcontrol, prefix);
+	UNUSED(invfind(&invcontrol, prefix));
 	if(caseless == true) { /* restore lower case */
-		(void)strcpy(prefix, lcasify(prefix));
+		UNUSED(strcpy(prefix, lcasify(prefix)));
 	}
 	/* a null prefix matches the null term in the inverted index,
 	   so move to the first real term */
-	if(*prefix == '\0') { (void)invforward(&invcontrol); }
+	if(*prefix == '\0') { invforward(&invcontrol); }
 	len = strlen(prefix);
 	do {
-		(void)invterm(&invcontrol, term); /* get the term */
+		UNUSED(invterm(&invcontrol, term)); /* get the term */
 		s = term;
 		if(caseless == true) { s = lcasify(s); /* make it lower case */ }
 		/* if it matches */
@@ -1108,7 +1105,7 @@ static POSTING *getposting(void) {
 	if(++searchcount % 100 == 0) {
 		progress("Possible references retrieved", searchcount, postingsfound);
 	}
-	return (postingp++);
+	return postingp++;
 }
 
 /* put the posting reference into the file */
@@ -1150,14 +1147,14 @@ long dbseek(long offset) {
 	if((n = offset / BUFSIZ) != blocknumber) {
 		if((rc = lseek(symrefs, n * BUFSIZ, 0)) == -1) {
 			myperror("Lseek failed");
-			(void)sleep(3);
-			return (rc);
+			sleep(3);
+			return rc;
 		}
-		(void)read_block();
+		read_block();
 		blocknumber = n;
 	}
 	blockp = block + offset % BUFSIZ;
-	return (rc);
+	return rc;
 }
 
 static void findcalledbysub(const char *file, bool macro) {
@@ -1175,12 +1172,12 @@ static void findcalledbysub(const char *file, bool macro) {
 			case FCNCALL: /* function call */
 
 				/* output the file name */
-				(void)fprintf(refsfound, "%s ", file);
+				UNUSED(fprintf(refsfound, "%s ", file));
 
 				/* output the function name */
 				skiprefchar();
 				putline(refsfound);
-				(void)putc(' ', refsfound);
+				UNUSED(putc(' ', refsfound));
 
 				/* output the source line */
 				putsource(1, refsfound);
@@ -1211,16 +1208,16 @@ bool writerefsfound(void) {
 	if(refsfound == NULL) {
 		if((refsfound = myfopen(temp1, "wb")) == NULL) {
 			cannotopen(temp1);
-			return (false);
+			return false;
 		}
 	} else {
-		(void)fclose(refsfound);
+		fclose(refsfound);
 		if((refsfound = myfopen(temp1, "wb")) == NULL) {
 			postmsg("Cannot reopen temporary file");
-			return (false);
+			return false;
 		}
 	}
-	return (true);
+	return true;
 }
 
 /* Perform token search based on "field" */
@@ -1249,31 +1246,33 @@ bool search(const char *query) {
 				return (false);
 			}
 			if((rc = findinit(query)) == NOERROR) {
-				(void)dbseek(0L); /* read the first block */
+				UNUSED(dbseek(0L)); /* read the first block */
 				findresult = (*f)(query);
-				if(f == findcalledby) funcexist = (*findresult == 'y');
+				if(f == findcalledby){
+					funcexist = (bool)(findresult);
+				}
 				findcleanup();
 
 				/* append the non-global references */
-				(void)fclose(nonglobalrefs);
+				UNUSED(fclose(nonglobalrefs));
 				if((nonglobalrefs = myfopen(temp2, "rb")) == NULL) {
 					cannotopen(temp2);
 					return (false);
 				}
 				while((c = getc(nonglobalrefs)) != EOF) {
-					(void)putc(c, refsfound);
+					UNUSED(putc(c, refsfound));
 				}
 			}
-			(void)fclose(nonglobalrefs);
+			UNUSED(fclose(nonglobalrefs));
 		}
 	}
 	signal(SIGINT, savesig);
 
 	/* rewind the cross-reference file */
-	(void)lseek(symrefs, (long)0, 0);
+	lseek(symrefs, (long)0, 0);
 
 	/* reopen the references found file for reading */
-	(void)fclose(refsfound);
+	fclose(refsfound);
 	if((refsfound = myfopen(temp1, "rb")) == NULL) {
 		cannotopen(temp1);
 		return (false);
@@ -1284,26 +1283,26 @@ bool search(const char *query) {
 	/* see if it is empty */
 	if((c = getc(refsfound)) == EOF) {
 		if(findresult != NULL) {
-			(void)snprintf(msg,
+			snprintf(msg,
 				sizeof(msg),
 				"Egrep %s in this pattern: %s",
 				findresult,
 				query);
 		} else if(rc == NOTSYMBOL) {
-			(void)snprintf(msg, sizeof(msg), "This is not a C symbol: %s", query);
+			snprintf(msg, sizeof(msg), "This is not a C symbol: %s", query);
 		} else if(rc == REGCMPERROR) {
-			(void)snprintf(msg,
+			snprintf(msg,
 				sizeof(msg),
 				"Error in this regcomp(3) regular expression: %s",
 				query);
 
 		} else if(funcexist == false) {
-			(void)snprintf(msg,
+			snprintf(msg,
 				sizeof(msg),
 				"Function definition does not exist: %s",
 				query);
 		} else {
-			(void)snprintf(msg,
+			snprintf(msg,
 				sizeof(msg),
 				"Could not find the %s: %s",
 				fields[field].text2,
@@ -1313,7 +1312,7 @@ bool search(const char *query) {
 		return (false);
 	}
 	/* put back the character read */
-	(void)ungetc(c, refsfound);
+	ungetc(c, refsfound);
 
 	countrefs();