[Cscope-cvs] CVS: cscope/src find.c,1.16,1.17

[Hans-Bernhard B. <br...@us...>]

Update of /cvsroot/cscope/cscope/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4678

Modified Files:
	find.c 
Log Message:
Renamed readblock() to read_block, avoiding a name clash with the QNX
system libraries.


Index: find.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/find.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** find.c	8 Jan 2004 14:07:20 -0000	1.16
--- find.c	30 Apr 2004 15:26:17 -0000	1.17
***************
*** 126,134 ****
  				++cp;
  			}
! 		} while (*(cp + 1) == '\0' && (cp = readblock()) != NULL);
  
  		/* skip the found character */
  		if (cp != NULL && *(++cp + 1) == '\0') {
! 			cp = readblock();
  		}
  		if (cp == NULL) {
--- 126,134 ----
  				++cp;
  			}
! 		} while (*(cp + 1) == '\0' && (cp = read_block()) != NULL);
  
  		/* skip the found character */
  		if (cp != NULL && *(++cp + 1) == '\0') {
! 			cp = read_block();
  		}
  		if (cp == NULL) {
***************
*** 738,742 ****
  			++i;
  		}
! 	} while (*(blockp + 1) == '\0' && readblock() != NULL);
  	
  	if (*blockp == '\n' && cpattern[i] == '\0') {
--- 738,742 ----
  			++i;
  		}
! 	} while (*(blockp + 1) == '\0' && read_block() != NULL);
  	
  	if (*blockp == '\n' && cpattern[i] == '\0') {
***************
*** 853,857 ****
  			++cp;
  		}
! 	} while (*(cp + 1) == '\0' && (cp = readblock()) != NULL);
  	blockp = cp;
  }
--- 853,857 ----
  			++cp;
  		}
! 	} while (*(cp + 1) == '\0' && (cp = read_block()) != NULL);
  	blockp = cp;
  }
***************
*** 879,883 ****
  			++cp;
  		}
! 	} while (*(cp + 1) == '\0' && (cp = readblock()) != NULL);
  	blockp = cp;
  	*s = '\0';
--- 879,883 ----
  			++cp;
  		}
! 	} while (*(cp + 1) == '\0' && (cp = read_block()) != NULL);
  	blockp = cp;
  	*s = '\0';
***************
*** 885,889 ****
  /* scan past the next occurence of this character in the cross-reference */
  
! char	*
  scanpast(char c)
  {
--- 885,889 ----
  /* scan past the next occurence of this character in the cross-reference */
  
! char *
  scanpast(char c)
  {
***************
*** 896,900 ****
  			++cp;
  		}
! 	} while (*(cp + 1) == '\0' && (cp = readblock()) != NULL);
  	blockp = cp;
  	if (cp != NULL) {
--- 896,900 ----
  			++cp;
  		}
! 	} while (*(cp + 1) == '\0' && (cp = read_block()) != NULL);
  	blockp = cp;
  	if (cp != NULL) {
***************
*** 905,911 ****
  
  /* read a block of the cross-reference */
! 
! char	*
! readblock(void)
  {
  	/* read the next block */
--- 905,911 ----
  
  /* 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 */
***************
*** 1149,1153 ****
  			return(rc);
  		}
! 		(void) readblock();
  		blocknumber = n;
  	}
--- 1149,1153 ----
  			return(rc);
  		}
! 		(void) read_block();
  		blocknumber = n;
  	}