[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Pure diffs
diff --recursive --unified /mint/biosfs.c /mymint/biosfs.c
--- /mint/biosfs.c Wed Jun 8 13:51:36 1994
+++ /mymint/biosfs.c Sun Jun 5 14:18:02 1994
@@ -825,7 +825,7 @@
*/
struct tty *ttyptr;
- if (!(ttyptr = kmalloc(SIZEOF(struct tty))))
+ if (NULL == (ttyptr = kmalloc(SIZEOF(struct tty))))
return ENSMEM;
b->tty = ttyptr;
}
@@ -1971,7 +1971,7 @@
return 0;
}
/* special code for opening a tty */
- if ((tty = (struct tty *)f->devinfo)) {
+ if (NULL != (tty = (struct tty *)f->devinfo)) {
extern struct tty default_tty; /* in tty.c */
/* first open for this device? */
diff --recursive --unified /mint/dos.c /mymint/dos.c
--- /mint/dos.c Wed Jun 8 13:51:44 1994
+++ /mymint/dos.c Sun Jun 5 14:18:02 1994
@@ -239,6 +239,8 @@
p_getauid(id)
int id;
{
+ UNUSED(id);
+
return curproc->auid;
}
@@ -246,6 +248,8 @@
p_setauid(id)
int id;
{
+ UNUSED(id);
+
if (curproc->auid)
return EACCDN;
@@ -258,6 +262,8 @@
int gidsetlen;
int gidset[];
{
+ UNUSED(gidsetlen); UNUSED(gidset);
+
return 0;
}
@@ -266,6 +272,8 @@
int ngroups;
int gidset[];
{
+ UNUSED(ngroups); UNUSED(gidset);
+
return EACCDN;
}
diff --recursive --unified /mint/dosdir.c /mymint/dosdir.c
--- /mint/dosdir.c Wed Jun 8 13:51:46 1994
+++ /mymint/dosdir.c Sun Jun 5 14:18:02 1994
@@ -731,17 +731,17 @@
{
#if 0
fcookie dir, fc;
+ XATTR xattr;
#else
fcookie dir;
#endif
long r;
char temp1[PATH_MAX];
- XATTR xattr;
TRACE(("Fdelete(%s)", name));
/* get a cookie for the directory the file is in */
- if (( r = path2cookie(name, temp1, &dir) ))
+ if (E_OK != ( r = path2cookie(name, temp1, &dir) ))
{
DEBUG(("Fdelete: couldn't get directory cookie: error %ld", r));
return r;
diff --recursive --unified /mint/dosfile.c /mymint/dosfile.c
--- /mint/dosfile.c Wed Jun 8 13:51:48 1994
+++ /mymint/dosfile.c Sun Jun 5 14:19:32 1994
@@ -1027,7 +1027,7 @@
f = p->handle[i];
if ((*f->dev->select)(f, (long)p, O_RDONLY) == 1 ||
(is_terminal(f) &&
- (scan = (tty=(struct tty *)f->devinfo)->state & TS_ESC) &&
+ 0 != (scan = (tty=(struct tty *)f->devinfo)->state & TS_ESC) &&
(tty->xkey ? tty->xkey[scan] :
vt52xkey[scan]))) {
count++;
diff --recursive --unified /mint/dosmem.c /mymint/dosmem.c
--- /mint/dosmem.c Wed Jun 8 13:51:52 1994
+++ /mymint/dosmem.c Sun Jun 5 14:18:02 1994
@@ -772,7 +772,7 @@
if (tty->use_cnt > 1) {
for (p = proclist; p; p = p->gl_next) {
if (p->pgrp == pgrp && p != curproc &&
- ((pfp = p->control)) &&
+ (0 != (pfp = p->control)) &&
pfp->fc.index == fp->fc.index &&
pfp->fc.dev == fp->fc.dev)
goto found;
@@ -787,6 +787,7 @@
tty->pgrp = 0;
}
found:
+ ;
}
#endif
diff --recursive --unified /mint/main.c /mymint/main.c
--- /mint/main.c Wed Jun 8 13:52:04 1994
+++ /mymint/main.c Sun Jun 5 14:18:02 1994
@@ -1380,13 +1380,13 @@
return;
}
if (!strcmp (cmd, "include")) {
- int fd = f_open (arg1, 0);
+ long fd = f_open (arg1, 0);
if (fd < 0) {
ALERT ("include: cannot open file %s", arg1);
return;
}
- do_file (fd);
- f_close (fd);
+ do_file ((int) fd);
+ f_close ((int) fd);
return;
}
arg2 = line;
diff --recursive --unified /mint/memprot.c /mymint/memprot.c
--- /mint/memprot.c Tue Sep 14 17:48:20 1993
+++ /mymint/memprot.c Sun Jun 5 14:18:02 1994
@@ -388,6 +388,8 @@
long_desc *tbl, *tbl_b, *tbl_c;
ulong oldlen;
+ UNUSED(proc);
+
if (no_mem_prot) return;
oldlen = len;
@@ -399,9 +401,9 @@
* d_index is the 8K number within that 1MB (0-127).
*/
- b_index = (start >> LOG2_16_MEG);
- c_index = (start >> LOG2_ONE_MEG) & 0xf;
- d_index = (start >> LOG2_EIGHT_K) & 0x7f;
+ b_index = (int)(start >> LOG2_16_MEG);
+ c_index = (int)((start >> LOG2_ONE_MEG) & 0xf);
+ d_index = (int)((start >> LOG2_EIGHT_K) & 0x7f);
/* precompute the table addresses */
tbl_b = &base_tbl[0].tbl_address[b_index];
@@ -1137,6 +1139,8 @@
tbl.tbl_address = proc->ctxt[CURRENT].crp.tbl_address;
_dump_tree(tbl,0);
}
+#else
+ UNUSED(proc); UNUSED(bigone);
#endif /* DEBUG_INFO */
}
diff --recursive --unified /mint/proc.c /mymint/proc.c
--- /mint/proc.c Wed Jun 8 13:52:12 1994
+++ /mymint/proc.c Sun Jun 5 14:18:02 1994
@@ -701,12 +701,13 @@
#endif
}
-unsigned long gen_average(sum, cur_load, load_array, ptr, max_size)
-long *sum;
-unsigned long cur_load;
-unsigned char load_array[];
-unsigned long ptr;
-int max_size;
+unsigned long
+gen_average(sum, cur_load, load_array, ptr, max_size)
+ unsigned long *sum;
+ unsigned long cur_load;
+ unsigned char load_array[];
+ unsigned long ptr;
+ int max_size;
{
unsigned long retval;
long old_load, new_load;
@@ -723,7 +724,8 @@
return retval;
}
-void calc_load_average()
+void
+calc_load_average()
{
PROC *p;
diff --recursive --unified /mint/procfs.c /mymint/procfs.c
--- /mint/procfs.c Wed Jun 8 13:52:16 1994
+++ /mymint/procfs.c Sun Jun 5 14:18:02 1994
@@ -577,7 +577,7 @@
FILEPTR *pf;
int pfd = (*(ushort *)buf);
if (pfd < MIN_HANDLE || pfd >= MAX_OPEN ||
- !(pf = p->handle[pfd]))
+ 0 == (pf = p->handle[pfd]))
return EIHNDL;
return (*pf->fc.fs->getxattr)(&pf->fc, (XATTR *)buf);
}
diff --recursive --unified /mint/proto.h /mymint/proto.h
--- /mint/proto.h Wed Jun 8 13:52:18 1994
+++ /mymint/proto.h Sun Jun 5 14:14:02 1994
@@ -260,7 +260,10 @@
void ARGS_ON_STACK wake P_((int que, long cond));
void ARGS_ON_STACK wakeselect P_((long param));
void DUMPPROC P_((void));
+void calc_load_average P_((void));
+unsigned long gen_average P_((unsigned long *sum, unsigned long cur_load, unsigned char load_array[], unsigned long ptr, int max_size));
+
/* signal.c */
long killgroup P_((int pgrp, int sig));
void post_sig P_((PROC *p, int sig));
diff --recursive --unified /mint/purec/makefile /mymint/purec/makefile
--- /mint/purec/makefile Fri Jun 25 20:01:04 1993
+++ /mymint/purec/makefile Sun Jun 5 14:26:54 1994
@@ -116,24 +116,24 @@
ATRANSOBJ = asmtab.o trutil.o trans.o
ATRANS = asmtrans.ttp
-$(ATRANS): $(ATRANSOBJ)
- $(NATIVECC) $(NATIVECFLAGS) -o $(ATRANS) $(ATRANSOBJ) \
- $(NATIVELIBS)
+#$(ATRANS): $(ATRANSOBJ)
+# $(NATIVECC) $(NATIVECFLAGS) -o $(ATRANS) $(ATRANSOBJ) \
+# $(NATIVELIBS)
-asmtab.o: asmtab.c asmtrans.h
- $(NATIVECC) $(NATIVECFLAGS) -o $@ -c asmtab.c
+#asmtab.o: asmtab.c asmtrans.h
+# $(NATIVECC) $(NATIVECFLAGS) -o $@ -c asmtab.c
-trutil.o: trutil.c asmtrans.h
- $(NATIVECC) $(NATIVECFLAGS) -o $@ -c trutil.c
+#trutil.o: trutil.c asmtrans.h
+# $(NATIVECC) $(NATIVECFLAGS) -o $@ -c trutil.c
-trans.o: trans.c asmtrans.h
- $(NATIVECC) $(NATIVECFLAGS) -o $@ -c trans.c
+#trans.o: trans.c asmtrans.h
+# $(NATIVECC) $(NATIVECFLAGS) -o $@ -c trans.c
-asmtab.c asmtab.h: asm.y
- $(YACC) asm.y
- mv $(YTABC) asmtab.c
- mv $(YTABH) asmtab.h
+#asmtab.c asmtab.h: asm.y
+# $(YACC) asm.y
+# mv $(YTABC) asmtab.c
+# mv $(YTABH) asmtab.h
# the magic number include file is generated automagically
# NOTE that of course, magic.i can only reliably be generated
diff --recursive --unified /mint/purec/mintpure.prj /mymint/purec/mintpure.prj
--- /mint/purec/mintpure.prj Fri Jun 25 20:00:50 1993
+++ /mymint/purec/mintpure.prj Sun Jun 5 14:26:30 1994
@@ -1,5 +1,5 @@
mint.prg
-.C [-DMULTITOS -D__STDC__ -W-stv]
+.C [-DMULTITOS -D__STDC__ -W-stv -P]
.S [-3 -8 -S]
=
PCSTART.O ; startup code
diff --recursive --unified /mint/purec/osbind.h /mymint/purec/osbind.h
--- /mint/purec/osbind.h Tue Mar 16 15:46:50 1993
+++ /mymint/purec/osbind.h Sun Jun 5 14:27:02 1994
@@ -286,7 +286,7 @@
int sideno, int interlv, long magic, int virgin );
void Midiws( int cnt, void *ptr );
void Mfpint( int erno, void (*vector)() );
-IOREC *Iorec( int dev );
+void *Iorec( int dev );
long Rsconf( int baud, int ctr, int ucr, int rsr, int tsr, int scr );
KEYTAB *Keytbl( void *unshift, void *shift, void *capslock );
long Random( void );
diff --recursive --unified /mint/purec/puremint.txt /mymint/purec/puremint.txt
--- /mint/purec/puremint.txt Tue Jul 27 14:39:50 1993
+++ /mymint/purec/puremint.txt Sun Jun 5 14:26:04 1994
@@ -1,7 +1,7 @@
-How to compile MiNT 1.08 with PureC
+How to compile MiNT 1.11 with PureC
-----------------------------------
-Julian F. Reschke, 25. Juni 1993
+Julian F. Reschke, 5. Juni 1994
email: reschke@math.uni-muenster.de
@@ -19,8 +19,8 @@
directory). I am compiling MiNT with GNU make (latest version at
atari.archive.umich.edu should work fine) and a self-made 'cc' command,
that I've specially written for the PureC command line versions (see
-makefile.pcc). This tool is still being tested, and I've not yet decided
-how to distribute it. If you are interested, write to me.
+makefile.pcc). This tool is available from ftp.uni-muenster.de,
+pub/atari/Tools/prgtl*.tos.
If you're going to use the PureC shell, you'll have to 'manually'
translate the .spp files to the PASM syntax using asmtrans.ttp. The
diff --recursive --unified /mint/xbios.c /mymint/xbios.c
--- /mint/xbios.c Wed Jun 8 13:52:36 1994
+++ /mymint/xbios.c Wed Jun 8 13:59:22 1994
@@ -155,7 +155,6 @@
long rsval;
static int oldbaud = -1;
int ret_oldbaud = 0;
- IOREC_T *ior;
TRACE(("Rsconf(%d,%d,%d,%d,%d,%d)", baud, flow,
uc, rs, ts, sc));
@@ -192,7 +191,7 @@
if (tosvers <= 0x0104) {
int attempts = 0;
short old_head;
- ior = ((IOREC_T *) uiorec(0)) + 1; /* output record */
+ IOREC_T *ior= ((IOREC_T *) uiorec(0)) + 1; /* output record */
old_head = ior->head;
while (ior->head != ior->tail) {
if (++attempts >= 50) { /* prevent getting stuck by flow control */
@@ -273,11 +272,10 @@
/* (if not, the next line will cause a bus error) */
#ifdef __TURBOC__
/* work-around for buggy optimizer */
- char dummy =
-#endif
- (void)(*((volatile char *)ptr));
-#ifdef __TURBOC__
+ char dummy = (*((volatile char *)ptr));
UNUSED(dummy);
+#else
+ (void)(*((volatile char *)ptr));
#endif
/* OK, now make sure that interrupt routines will have access,
* too
--
---------------------------------------------------
Julian F. Reschke, Hensenstr. 142, D-48161 Muenster
eMail: reschke@math.uni-muenster.de jr@ms.maus.de
___________________________________________________