From: Jorrit Herder <jnherder@minix3.org>
Date: Thu, 25 Aug 2005 12:35:59 +0000 (+0000)
Subject: Fixed gcc warnings in MEM driver.
X-Git-Tag: v3.1.0~279
X-Git-Url: http://zhaoyanbai.com/repos/%22https:/www.google.com/jsapi/static/gitweb.css?a=commitdiff_plain;h=8b6b353c8601529bf75dc6d047e206511bb9ab58;p=minix.git

Fixed gcc warnings in MEM driver.
---

diff --git a/drivers/memory/memory.c b/drivers/memory/memory.c
index 6422ed651..611010173 100644
--- a/drivers/memory/memory.c
+++ b/drivers/memory/memory.c
@@ -70,11 +70,12 @@ PRIVATE char dev_zero[ZERO_BUF_SIZE];
 /*===========================================================================*
  *				   main 				     *
  *===========================================================================*/
-PUBLIC void main(void)
+PUBLIC int main(void)
 {
 /* Main program. Initialize the memory driver and start the main loop. */
   m_init();			
   driver_task(&m_dtab);		
+  return(OK);				
 }
 
 /*===========================================================================*
@@ -111,7 +112,7 @@ iovec_t *iov;			/* pointer to read or write request vector */
 unsigned nr_req;		/* length of request vector */
 {
 /* Read or write one the driver's minor devices. */
-  phys_bytes mem_phys, user_phys;
+  phys_bytes mem_phys;
   int seg;
   unsigned count, left, chunk;
   vir_bytes user_vir;
@@ -287,7 +288,6 @@ message *m_ptr;				/* pointer to control message */
 	/* FS wants to create a new RAM disk with the given size. */
 	phys_bytes ramdev_size;
 	phys_bytes ramdev_base;
-	message m;
 	int s;
 
 	if (m_ptr->PROC_NR != FS_PROC_NR) {