Attachment #194259 for bug #272705

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

Lines 358-368 Link Here

(-)omniORB-4.1.3.original/src/appl/utils/catior/catior.cc (-1 / +1 lines)
358		358
359	int c;	359	int c;
360	int hexflag = 0;	360	int hexflag = 0;
361	int omniflag = 0;	361	int omniflag = 0;
362		362
363	while((c = getopt(argc,argv,"xo")) != EOF) {	363	while((c = getopt(argc,argv,"xo")) != -1) {
364	switch(c) {	364	switch(c) {
365	case 'x':	365	case 'x':
366	hexflag = 1;	366	hexflag = 1;
367	break;	367	break;
368	case 'o':	368	case 'o':

Lines 148-158 Link Here

(-)omniORB-4.1.3.original/src/appl/utils/convertior/convertior.cc (-1 / +1 lines)
148		148
149	// Get options:	149	// Get options:
150		150
151	int c;	151	int c;
152		152
153	while((c = getopt(argc,argv,"x")) != EOF)	153	while((c = getopt(argc,argv,"x")) != -1)
154	{	154	{
155	switch(c)	155	switch(c)
156	{	156	{
157	case '?':	157	case '?':
158	case 'h':	158	case 'h':

Lines 126-136 Link Here

(-)omniORB-4.1.3.original/src/tool/omkdepend/def.h (-1 / +1 lines)
126	char *realloc();	126	char *realloc();
127	#endif	127	#endif
128		128
129	char *copy();	129	char *copy();
130	char *base_name();	130	char *base_name();
131	char *getline();	131	char *get_line();
132	struct symtab *slookup();	132	struct symtab *slookup();
133	struct symtab *isdefined();	133	struct symtab *isdefined();
134	struct symtab *fdefined();	134	struct symtab *fdefined();
135	struct filepointer *getfile();	135	struct filepointer *getfile();
136	struct inclist *newinclude();	136	struct inclist *newinclude();

Lines 467-477 Link Here

(-)omniORB-4.1.3.original/src/tool/omkdepend/main.c (-1 / +1 lines)
467		467
468	/*	468	/*
469	* Get the next line. We only return lines beginning with '#' since that	469	* Get the next line. We only return lines beginning with '#' since that
470	* is all this program is ever interested in.	470	* is all this program is ever interested in.
471	*/	471	*/
472	char *getline(filep)	472	char *get_line(filep)
473	register struct filepointer *filep;	473	register struct filepointer *filep;
474	{	474	{
475	register char p, / walking pointer */	475	register char p, / walking pointer */
476	eof, / end of file pointer */	476	eof, / end of file pointer */
477	bol; / beginning of line pointer */	477	bol; / beginning of line pointer */




{
	register char	*line;
	register int	type;
	boolean recfailOK;

	while (line = get_line(filep)) {
		switch(type = deftype(line, filep, file_red, file, TRUE)) {
		case IF:
		doif:
			type = find_includes(filep, file,
				file_red, recursion+1, failOK);

	struct inclist		*file, *file_red;
{
	register char	*line;
	register int	type;

	while (line = get_line(filep)) {
		switch(type = deftype(line, filep, file_red, file, FALSE)) {
		case IF:
		case IFFALSE:
		case IFGUESSFALSE:
		case IFDEF:

Return to bug 272705

Lines 39-49 Link Here

(-)omniORB-4.1.3.original/src/tool/omkdepend/parse.c (-2 / +2 lines)
39	{	39	{
40	register char *line;	40	register char *line;
41	register int type;	41	register int type;
42	boolean recfailOK;	42	boolean recfailOK;
43		43
44	while (line = getline(filep)) {	44	while (line = get_line(filep)) {
45	switch(type = deftype(line, filep, file_red, file, TRUE)) {	45	switch(type = deftype(line, filep, file_red, file, TRUE)) {
46	case IF:	46	case IF:
47	doif:	47	doif:
48	type = find_includes(filep, file,	48	type = find_includes(filep, file,
49	file_red, recursion+1, failOK);	49	file_red, recursion+1, failOK);
Lines 164-174 Link Here
164	struct inclist file, file_red;	164	struct inclist file, file_red;
165	{	165	{
166	register char *line;	166	register char *line;
167	register int type;	167	register int type;
168		168
169	while (line = getline(filep)) {	169	while (line = get_line(filep)) {
170	switch(type = deftype(line, filep, file_red, file, FALSE)) {	170	switch(type = deftype(line, filep, file_red, file, FALSE)) {
171	case IF:	171	case IF:
172	case IFFALSE:	172	case IFFALSE:
173	case IFGUESSFALSE:	173	case IFGUESSFALSE:
174	case IFDEF:	174	case IFDEF: