Skip to content

Commit 26511fe

Browse files
davidgivendavidgiven
authored
Merge pull request #321 from davidgiven/dtrg-simplify
Replace some old and extremely obsolete system call wrappers with direct system calls.
2 parents 9152154 + cea6b9a commit 26511fe

File tree

302 files changed

+2825
-4368
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

302 files changed

+2825
-4368
lines changed

‎doc/ceg/ceg.tr‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,7 +1190,7 @@ struct t_operand *op;
11901190
case BX : R233( 0x0, reg, 0x7);
11911191
break;
11921192

1193-
default : fprint( STDERR, "Wrong index register %d\en",
1193+
default : fprintf( stderr, "Wrong index register %d\en",
11941194
op->reg);
11951195
}
11961196
else {
@@ -1208,7 +1208,7 @@ struct t_operand *op;
12081208
case BX : R233( 0x1, reg, 0x7);
12091209
break;
12101210

1211-
default : fprint( STDERR, "Wrong index register %d\en",
1211+
default : fprintf( stderr, "Wrong index register %d\en",
12121212
op->reg);
12131213
}
12141214
@text1( %$(op->expr));
@@ -1226,7 +1226,7 @@ struct t_operand *op;
12261226
case BX : R233( 0x2, reg, 0x7);
12271227
break;
12281228

1229-
default : fprint( STDERR, "Wrong index register %d\en",
1229+
default : fprintf( stderr, "Wrong index register %d\en",
12301230
op->reg);
12311231
}
12321232
@text2( %$(op->expr));

‎fast/f_c.ansi/Parameters‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
!File: errout.h
10-
#define ERROUT STDERR /* file pointer for writing messages */
10+
#define ERROUT stderr /* file pointer for writing messages */
1111
#define ERR_SHADOW 5 /* a syntax error overshadows error messages
1212
until ERR_SHADOW symbols have been
1313
accepted without syntax error */

‎fast/f_c/Parameters‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
!File: errout.h
10-
#define ERROUT STDERR /* file pointer for writing messages */
10+
#define ERROUT stderr /* file pointer for writing messages */
1111
#define ERR_SHADOW 5 /* a syntax error overshadows error messages
1212
until ERR_SHADOW symbols have been
1313
accepted without syntax error */

‎fast/f_m2/Parameters‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
!File: errout.h
2-
#define ERROUT STDERR /* file pointer for writing messages */
2+
#define ERROUT stderr /* file pointer for writing messages */
33
#define ERR_SHADOW 5 /* a syntax error overshadows error messages
44
until ERR_SHADOW symbols have been
55
accepted without syntax error */

‎fast/f_pc/Parameters‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111
!File: errout.h
12-
#define ERROUT STDERR /* file pointer for writing messages */
12+
#define ERROUT stderr /* file pointer for writing messages */
1313
#define MAXERR_LINE 5 /* maximum number of error messages given
1414
on the same input line. */
1515

‎fcc/cemcom/Parameters.sun3‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
!File: errout.h
10-
#define ERROUT STDERR /* file pointer for writing messages */
10+
#define ERROUT stderr /* file pointer for writing messages */
1111
#define ERR_SHADOW 5 /* a syntax error overshadows error messages
1212
until ERR_SHADOW symbols have been
1313
accepted without syntax error */

‎fcc/cemcom/Parameters.vax4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
!File: errout.h
10-
#define ERROUT STDERR /* file pointer for writing messages */
10+
#define ERROUT stderr /* file pointer for writing messages */
1111
#define ERR_SHADOW 5 /* a syntax error overshadows error messages
1212
until ERR_SHADOW symbols have been
1313
accepted without syntax error */

‎lang/basic/src/basic.g‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -231,20 +231,20 @@ filelist { int intv; }
231231
]* ;
232232

233233
datastmt: DATASYM { datastmt(); in_data = 1;}
234-
datalist { fprint(datfile,"\n"); in_data = 0; }
234+
datalist { fprintf(datfile,"\n"); in_data = 0; }
235235
;
236236

237-
dataelm : INTVALUE { fprint(datfile,"%d",ival); }
238-
| '-' [ INTVALUE { fprint(datfile,"%d",-ival); }
239-
| FLTVALUE { fprint(datfile,"-%s",dval); }
237+
dataelm : INTVALUE { fprintf(datfile,"%d",ival); }
238+
| '-' [ INTVALUE { fprintf(datfile,"%d",-ival); }
239+
| FLTVALUE { fprintf(datfile,"-%s",dval); }
240240
]
241-
| FLTVALUE { fprint(datfile,dval); }
242-
| STRVALUE { fprint(datfile,"\"%s\"",sval); }
243-
| IDENTIFIER { fprint(datfile,"\"%s\"",sval); }
241+
| FLTVALUE { fprintf(datfile,dval); }
242+
| STRVALUE { fprintf(datfile,"\"%s\"",sval); }
243+
| IDENTIFIER { fprintf(datfile,"\"%s\"",sval); }
244244
;
245245

246246
datalist: dataelm
247-
[ ',' { fprint(datfile,","); }
247+
[ ',' { fprintf(datfile,","); }
248248
dataelm ]*
249249
;
250250

‎lang/basic/src/basic.lex‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ void fillkex(void)
170170
if (debug)
171171
{
172172
for(i=0;i<27;i++)
173-
print("%c:%d\n",'a'+i,kex[i]);
173+
printf("%c:%d\n",'a'+i,kex[i]);
174174
}
175175
}
176176

@@ -191,7 +191,7 @@ char fgets_buf[GETSBUFSIZE];
191191

192192

193193

194-
char *our_fgets(char* buffer, int n_char, File* stream)
194+
char *our_fgets(char* buffer, int n_char, FILE* stream)
195195
{
196196
/* Read one line or n_char */
197197
static int characters_left = 0;
@@ -217,10 +217,10 @@ char *our_fgets(char* buffer, int n_char, File* stream)
217217
return(buffer);
218218
}
219219
} else { /* Read new block */
220-
sys_read(stream,fgets_buf,GETSBUFSIZE,&characters_left);
220+
characters_left = fread(fgets_buf, 1, GETSBUFSIZE, stream);
221221
internal_bufp = fgets_buf;
222222
/* Move pointer back to the beginning */
223-
if ( characters_left == 0 ) { /* Nothing read */
223+
if ( characters_left <= 0 ) { /* Nothing read */
224224
if ( external_bufp == buffer ) {
225225
*external_bufp = '\0';
226226
return(0); /* EOF */
@@ -244,7 +244,7 @@ int getinputline(void)
244244
error("source line too long");
245245
inputline[MAXLINELENGTH-1]=0;
246246
if ( listing)
247-
fprint(STDERR, inputline);
247+
fprintf(stderr, inputline);
248248
cptr= inputline;
249249
return(TRUE);
250250
}
@@ -296,7 +296,7 @@ int lookup(void)
296296
/* keywords door delimiters gescheiden */
297297
cptr += k->length;
298298
yylval.integer= k->classvalue;
299-
if (debug) print("lookup:%d %d\n",
299+
if (debug) printf("lookup:%d %d\n",
300300
k->classvalue,k->token);
301301
if ( k->token == FUNCTION)
302302
{
@@ -329,7 +329,7 @@ int lookup(void)
329329
}
330330
if ( typech)
331331
Sym->symtype=typech;
332-
if (debug) print("lookup:%d Identifier\n",Sym);
332+
if (debug) printf("lookup:%d Identifier\n",Sym);
333333
if ( (name[0]=='f' || name[0]=='F') &&
334334
(name[1]=='n' || name[1]=='N') )
335335
return(FUNCTID);
@@ -422,7 +422,7 @@ int number(void)
422422
}
423423
/*NOSTRICT*/ ival= i1;
424424
#ifdef YYDEBUG
425-
if (yydebug) print("number:INTVALUE %d",i1);
425+
if (yydebug) printf("number:INTVALUE %d",i1);
426426
#endif
427427
return(INTVALUE);
428428
}
@@ -452,7 +452,7 @@ int number(void)
452452
*d = 0;
453453
cptr=c;
454454
#ifdef YYDEBUG
455-
if (yydebug) print("number:FLTVALUE %s",dval);
455+
if (yydebug) printf("number:FLTVALUE %s",dval);
456456
#endif
457457
return(FLTVALUE);
458458
}
@@ -481,7 +481,7 @@ int scanstring(void)
481481
case 0:
482482
case '\n':
483483
#ifdef YYDEBUG
484-
if (yydebug) print("STRVALUE\n");
484+
if (yydebug) printf("STRVALUE\n");
485485
#endif
486486
if ( firstchar == '"')
487487
error("non-terminated string");
@@ -521,7 +521,7 @@ int scanstring(void)
521521
C_rom_icon(myitoa(length),(arith)BEMINTSIZE);
522522
}
523523
#ifdef YYDEBUG
524-
if (yydebug) print("STRVALUE found\n");
524+
if (yydebug) printf("STRVALUE found\n");
525525
#endif
526526
return(STRVALUE);
527527
}
@@ -561,7 +561,7 @@ int yylex(void)
561561
return(EOLN);
562562
case 0:
563563
#ifdef YYDEBUG
564-
if ( yydebug) print("end of buffer");
564+
if ( yydebug) printf("end of buffer");
565565
#endif
566566
return(0);
567567
case '"':

‎lang/basic/src/bem.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ int main(int argc,char **argv)
5353
compileprogram();
5454
linewarnings();
5555
C_close();
56-
if( errorcnt) sys_stop(S_EXIT);
56+
if( errorcnt) exit(1);
5757
/* process em object files */
58-
sys_stop(S_END); /* This was not done in the old compiler */
58+
exit(0); /* This was not done in the old compiler */
5959
}

0 commit comments

Comments
 (0)