2000-10-19 Antti P Miettinen <anmietti@trshp.ntc.nokia.com>

	* lib/tftpDriver.c: add comments to handlers struct function pointers.
	* rtems/rtems_glue.c: move pointer arithmetic to be _after_
	pointer has been checked against NULL.

9 files changed, 63 insertions, 39 deletions

diff --git a/c/src/exec/libnetworking/ChangeLog b/c/src/exec/libnetworking/ChangeLog
index 9eba9725ae..efd9aec908 100644
--- a/c/src/exec/libnetworking/ChangeLog
+++ b/c/src/exec/libnetworking/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-19  Antti P Miettinen  <anmietti@trshp.ntc.nokia.com>
+
+	* lib/tftpDriver.c: add comments to handlers struct function pointers.
+	* rtems/rtems_glue.c: move pointer arithmetic to be _after_
+	pointer has been checked against NULL.
+
 2000-10-18	 Chris Johns <ccj@acm.org>
 
 	* pppd/ipxcp.c: Fixed a typo.
diff --git a/c/src/exec/libnetworking/lib/tftpDriver.c b/c/src/exec/libnetworking/lib/tftpDriver.c
index ea3de5a901..4294356b9c 100644
--- a/c/src/exec/libnetworking/lib/tftpDriver.c
+++ b/c/src/exec/libnetworking/lib/tftpDriver.c
@@ -760,16 +760,18 @@ rtems_filesystem_operations_table  rtems_tftp_ops = {
 };
 
 rtems_filesystem_file_handlers_r rtems_tftp_handlers = {
-  rtems_tftp_open,
-  rtems_tftp_close,
-  rtems_tftp_read,
-  rtems_tftp_write,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
+  rtems_tftp_open,   /* open */     
+  rtems_tftp_close,  /* close */    
+  rtems_tftp_read,   /* read */     
+  rtems_tftp_write,  /* write */    
+  NULL,		     /* ioctl */    
+  NULL,		     /* lseek */    
+  NULL,		     /* fstat */    
+  NULL,		     /* fchmod */   
+  NULL,		     /* ftruncate */
+  NULL,		     /* fpathconf */
+  NULL,		     /* fsync */    
+  NULL,		     /* fdatasync */
+  NULL,		     /* fcntl */
+  NULL		     /* rmnod */
 };
diff --git a/c/src/exec/libnetworking/rtems/rtems_glue.c b/c/src/exec/libnetworking/rtems/rtems_glue.c
index 86a1dbfc21..52c3361366 100644
--- a/c/src/exec/libnetworking/rtems/rtems_glue.c
+++ b/c/src/exec/libnetworking/rtems/rtems_glue.c
@@ -142,11 +142,11 @@ bsd_init (void)
 	 * Set up mbuf cluster data strutures
 	 */
 	p = malloc ((nmbclusters*MCLBYTES)+MCLBYTES-1);
-	p = (char *)(((unsigned long)p + (MCLBYTES-1)) & ~(MCLBYTES-1));
 	if (p == NULL) {
 		printf ("Can't get network cluster memory.\n");
 		return -1;
 	}
+	p = (char *)(((unsigned long)p + (MCLBYTES-1)) & ~(MCLBYTES-1));
 	mbutl = (struct mbuf *)p;
 	for (i = 0; i < nmbclusters; i++) {
 		((union mcluster *)p)->mcl_next = mclfree;
diff --git a/c/src/libnetworking/ChangeLog b/c/src/libnetworking/ChangeLog
index 9eba9725ae..efd9aec908 100644
--- a/c/src/libnetworking/ChangeLog
+++ b/c/src/libnetworking/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-19  Antti P Miettinen  <anmietti@trshp.ntc.nokia.com>
+
+	* lib/tftpDriver.c: add comments to handlers struct function pointers.
+	* rtems/rtems_glue.c: move pointer arithmetic to be _after_
+	pointer has been checked against NULL.
+
 2000-10-18	 Chris Johns <ccj@acm.org>
 
 	* pppd/ipxcp.c: Fixed a typo.
diff --git a/c/src/libnetworking/lib/tftpDriver.c b/c/src/libnetworking/lib/tftpDriver.c
index ea3de5a901..4294356b9c 100644
--- a/c/src/libnetworking/lib/tftpDriver.c
+++ b/c/src/libnetworking/lib/tftpDriver.c
@@ -760,16 +760,18 @@ rtems_filesystem_operations_table  rtems_tftp_ops = {
 };
 
 rtems_filesystem_file_handlers_r rtems_tftp_handlers = {
-  rtems_tftp_open,
-  rtems_tftp_close,
-  rtems_tftp_read,
-  rtems_tftp_write,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
+  rtems_tftp_open,   /* open */     
+  rtems_tftp_close,  /* close */    
+  rtems_tftp_read,   /* read */     
+  rtems_tftp_write,  /* write */    
+  NULL,		     /* ioctl */    
+  NULL,		     /* lseek */    
+  NULL,		     /* fstat */    
+  NULL,		     /* fchmod */   
+  NULL,		     /* ftruncate */
+  NULL,		     /* fpathconf */
+  NULL,		     /* fsync */    
+  NULL,		     /* fdatasync */
+  NULL,		     /* fcntl */
+  NULL		     /* rmnod */
 };
diff --git a/c/src/libnetworking/rtems/rtems_glue.c b/c/src/libnetworking/rtems/rtems_glue.c
index 86a1dbfc21..52c3361366 100644
--- a/c/src/libnetworking/rtems/rtems_glue.c
+++ b/c/src/libnetworking/rtems/rtems_glue.c
@@ -142,11 +142,11 @@ bsd_init (void)
 	 * Set up mbuf cluster data strutures
 	 */
 	p = malloc ((nmbclusters*MCLBYTES)+MCLBYTES-1);
-	p = (char *)(((unsigned long)p + (MCLBYTES-1)) & ~(MCLBYTES-1));
 	if (p == NULL) {
 		printf ("Can't get network cluster memory.\n");
 		return -1;
 	}
+	p = (char *)(((unsigned long)p + (MCLBYTES-1)) & ~(MCLBYTES-1));
 	mbutl = (struct mbuf *)p;
 	for (i = 0; i < nmbclusters; i++) {
 		((union mcluster *)p)->mcl_next = mclfree;
diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog
index 9eba9725ae..efd9aec908 100644
--- a/cpukit/libnetworking/ChangeLog
+++ b/cpukit/libnetworking/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-19  Antti P Miettinen  <anmietti@trshp.ntc.nokia.com>
+
+	* lib/tftpDriver.c: add comments to handlers struct function pointers.
+	* rtems/rtems_glue.c: move pointer arithmetic to be _after_
+	pointer has been checked against NULL.
+
 2000-10-18	 Chris Johns <ccj@acm.org>
 
 	* pppd/ipxcp.c: Fixed a typo.
diff --git a/cpukit/libnetworking/lib/tftpDriver.c b/cpukit/libnetworking/lib/tftpDriver.c
index ea3de5a901..4294356b9c 100644
--- a/cpukit/libnetworking/lib/tftpDriver.c
+++ b/cpukit/libnetworking/lib/tftpDriver.c
@@ -760,16 +760,18 @@ rtems_filesystem_operations_table  rtems_tftp_ops = {
 };
 
 rtems_filesystem_file_handlers_r rtems_tftp_handlers = {
-  rtems_tftp_open,
-  rtems_tftp_close,
-  rtems_tftp_read,
-  rtems_tftp_write,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
+  rtems_tftp_open,   /* open */     
+  rtems_tftp_close,  /* close */    
+  rtems_tftp_read,   /* read */     
+  rtems_tftp_write,  /* write */    
+  NULL,		     /* ioctl */    
+  NULL,		     /* lseek */    
+  NULL,		     /* fstat */    
+  NULL,		     /* fchmod */   
+  NULL,		     /* ftruncate */
+  NULL,		     /* fpathconf */
+  NULL,		     /* fsync */    
+  NULL,		     /* fdatasync */
+  NULL,		     /* fcntl */
+  NULL		     /* rmnod */
 };
diff --git a/cpukit/libnetworking/rtems/rtems_glue.c b/cpukit/libnetworking/rtems/rtems_glue.c
index 86a1dbfc21..52c3361366 100644
--- a/cpukit/libnetworking/rtems/rtems_glue.c
+++ b/cpukit/libnetworking/rtems/rtems_glue.c
@@ -142,11 +142,11 @@ bsd_init (void)
 	 * Set up mbuf cluster data strutures
 	 */
 	p = malloc ((nmbclusters*MCLBYTES)+MCLBYTES-1);
-	p = (char *)(((unsigned long)p + (MCLBYTES-1)) & ~(MCLBYTES-1));
 	if (p == NULL) {
 		printf ("Can't get network cluster memory.\n");
 		return -1;
 	}
+	p = (char *)(((unsigned long)p + (MCLBYTES-1)) & ~(MCLBYTES-1));
 	mbutl = (struct mbuf *)p;
 	for (i = 0; i < nmbclusters; i++) {
 		((union mcluster *)p)->mcl_next = mclfree;