Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use of all NIL_* defines converted to NULL

Browse Source
This commit is contained in:
Tomas Hruby
2010-05-10 13:26:00 +00:00
parent a1636b85b7
commit 6e25ad8b0a
86 changed files with 447 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/at_wini/at_wini.c
+6 -6
View File
@@ -579,7 +579,7 @@ PRIVATE int w_do_open(struct driver *dp, message *m_ptr)
struct wini *wn;
if (w_prepare(m_ptr->DEVICE) == NIL_DEV) return(ENXIO);
if (w_prepare(m_ptr->DEVICE) == NULL) return(ENXIO);
wn = w_wn;
@@ -657,7 +657,7 @@ PRIVATE struct device *w_prepare(int device)
w_dv = &w_wn->subpart[device % SUB_PER_DRIVE];
} else {
w_device = -1;
return(NIL_DEV);
return(NULL);
}
return(w_dv);
}
@@ -954,13 +954,13 @@ PRIVATE int w_io_test(void)
w_testing = 1;
/* Try I/O on the actual drive (not any (sub)partition). */
if (w_prepare(w_drive * DEV_PER_DRIVE) == NIL_DEV)
if (w_prepare(w_drive * DEV_PER_DRIVE) == NULL)
panic("Couldn't switch devices");
r = w_transfer(SELF, DEV_GATHER_S, cvu64(0), &iov, 1);
/* Switch back. */
if (w_prepare(save_dev) == NIL_DEV)
if (w_prepare(save_dev) == NULL)
panic("Couldn't switch back devices");
/* Restore parameters. */
@@ -1726,7 +1726,7 @@ PRIVATE void w_need_reset()
PRIVATE int w_do_close(struct driver *dp, message *m_ptr)
{
/* Device close: Release a device. */
if (w_prepare(m_ptr->DEVICE) == NIL_DEV)
if (w_prepare(m_ptr->DEVICE) == NULL)
return(ENXIO);
w_wn->open_ct--;
#if ENABLE_ATAPI
@@ -2352,7 +2352,7 @@ message *m;
return OK;
} else if (m->REQUEST == DIOCOPENCT) {
int count;
if (w_prepare(m->DEVICE) == NIL_DEV) return ENXIO;
if (w_prepare(m->DEVICE) == NULL) return ENXIO;
count = w_wn->open_ct;
r= sys_safecopyto(m->IO_ENDPT, (cp_grant_id_t) m->IO_GRANT,
0, (vir_bytes)&count, sizeof(count), D);
drivers/bios_wini/bios_wini.c
+5 -5
View File
@@ -159,10 +159,10 @@ int device;
w_wn = &wini[w_drive];
w_dv = &w_wn->subpart[device % SUB_PER_DRIVE];
} else {
return(NIL_DEV);
return(NULL);
}
if (w_drive >= MAX_DRIVES || !w_wn->present)
return NIL_DEV;
return NULL;
return(w_dv);
}
@@ -369,7 +369,7 @@ message *m_ptr;
if (!init_done) { w_init(); init_done = TRUE; }
if (w_prepare(m_ptr->DEVICE) == NIL_DEV) return(ENXIO);
if (w_prepare(m_ptr->DEVICE) == NULL) return(ENXIO);
if (w_wn->open_ct++ == 0) {
/* Partition the disk. */
@@ -387,7 +387,7 @@ message *m_ptr;
{
/* Device close: Release a device. */
if (w_prepare(m_ptr->DEVICE) == NIL_DEV) return(ENXIO);
if (w_prepare(m_ptr->DEVICE) == NULL) return(ENXIO);
w_wn->open_ct--;
return(OK);
}
@@ -526,7 +526,7 @@ PRIVATE int w_other(struct driver *UNUSED(dr), message *m)
if (m->REQUEST == DIOCOPENCT) {
int count;
if (w_prepare(m->DEVICE) == NIL_DEV) return ENXIO;
if (w_prepare(m->DEVICE) == NULL) return ENXIO;
count = w_wn->open_ct;
r=sys_safecopyto(m->IO_ENDPT, (cp_grant_id_t)m->IO_GRANT,
0, (vir_bytes)&count, sizeof(count), D);
drivers/floppy/floppy.c
+2 -2
View File
@@ -456,7 +456,7 @@ PRIVATE struct device *f_prepare(int device)
f_device = device;
f_drive = device & ~(DEV_TYPE_BITS | FORMAT_DEV_BIT);
if (f_drive < 0 || f_drive >= NR_DRIVES) return(NIL_DEV);
if (f_drive < 0 || f_drive >= NR_DRIVES) return(NULL);
f_fp = &floppy[f_drive];
f_dv = &f_fp->fl_geom;
@@ -1316,7 +1316,7 @@ message *m_ptr; /* pointer to open message */
struct test_order *top;
/* Decode the message parameters. */
if (f_prepare(m_ptr->DEVICE) == NIL_DEV) return(ENXIO);
if (f_prepare(m_ptr->DEVICE) == NULL) return(ENXIO);
dtype = f_device & DEV_TYPE_BITS; /* get density from minor dev */
if (dtype >= MINOR_fd0p0) dtype = 0;
drivers/log/log.c
+2 -2
View File
@@ -149,7 +149,7 @@ int device;
{
/* Prepare for I/O on a device: check if the minor device number is ok. */
if (device < 0 || device >= NR_DEVS) return(NIL_DEV);
if (device < 0 || device >= NR_DEVS) return(NULL);
log_device = device;
return(&log_geom[device]);
@@ -373,7 +373,7 @@ PRIVATE int log_do_open(dp, m_ptr)
struct driver *dp;
message *m_ptr;
{
if (log_prepare(m_ptr->DEVICE) == NIL_DEV) return(ENXIO);
if (log_prepare(m_ptr->DEVICE) == NULL) return(ENXIO);
return(OK);
}
drivers/memory/memory_driver/memory.c
+4 -4
View File
@@ -177,7 +177,7 @@ PRIVATE struct device *m_prepare(device)
int device;
{
/* Prepare for I/O on a device: check if the minor device number is ok. */
if (device < 0 || device >= NR_DEVS) return(NIL_DEV);
if (device < 0 || device >= NR_DEVS) return(NULL);
m_device = device;
return(&m_geom[device]);
@@ -352,7 +352,7 @@ message *m_ptr;
int r;
/* Check device number on open. */
if (m_prepare(m_ptr->DEVICE) == NIL_DEV) return(ENXIO);
if (m_prepare(m_ptr->DEVICE) == NULL) return(ENXIO);
if (m_device == MEM_DEV)
{
r = sys_enable_iop(m_ptr->IO_ENDPT);
@@ -382,7 +382,7 @@ message *m_ptr;
{
int r;
if (m_prepare(m_ptr->DEVICE) == NIL_DEV) return(ENXIO);
if (m_prepare(m_ptr->DEVICE) == NULL) return(ENXIO);
if(m_device < 0 || m_device >= NR_DEVS) {
panic("wrong m_device: %d", m_device);
@@ -423,7 +423,7 @@ message *m_ptr; /* pointer to control message */
if((dev < RAM_DEV_FIRST || dev > RAM_DEV_LAST) && dev != RAM_DEV_OLD) {
printf("MEM: MIOCRAMSIZE: %d not a ramdisk\n", dev);
}
if ((dv = m_prepare(dev)) == NIL_DEV) return(ENXIO);
if ((dv = m_prepare(dev)) == NULL) return(ENXIO);
/* Get request structure */
s= sys_safecopyfrom(m_ptr->IO_ENDPT, (vir_bytes)m_ptr->IO_GRANT,
drivers/random/main.c
+3 -3
View File
@@ -142,7 +142,7 @@ int device;
{
/* Prepare for I/O on a device: check if the minor device number is ok. */
if (device < 0 || device >= NR_DEVS) return(NIL_DEV);
if (device < 0 || device >= NR_DEVS) return(NULL);
m_device = device;
return(&m_geom[device]);
@@ -233,7 +233,7 @@ message *m_ptr;
{
/* Check device number on open.
*/
if (r_prepare(m_ptr->DEVICE) == NIL_DEV) return(ENXIO);
if (r_prepare(m_ptr->DEVICE) == NULL) return(ENXIO);
return(OK);
}
@@ -245,7 +245,7 @@ PRIVATE int r_ioctl(dp, m_ptr)
struct driver *dp; /* pointer to driver structure */
message *m_ptr; /* pointer to control message */
{
if (r_prepare(m_ptr->DEVICE) == NIL_DEV) return(ENXIO);
if (r_prepare(m_ptr->DEVICE) == NULL) return(ENXIO);
switch (m_ptr->REQUEST) {