[Tinyos-commits] CVS: tinyos-1.x/tos/lib/Deluge DelugeM.nc, 1.56, 1.57

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/tos/lib/Deluge
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7168

Modified Files:
	DelugeM.nc 
Log Message:
- Code cleanup.



Index: DelugeM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/Deluge/DelugeM.nc,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** DelugeM.nc	18 Aug 2005 02:28:09 -0000	1.56
--- DelugeM.nc	18 Aug 2005 17:31:55 -0000	1.57
***************
*** 213,223 ****
  
        // make sure node desc is valid
!       memcpy(&pMsg->nodeDesc, &nodeDesc, sizeof(DelugeNodeDesc));
!       if ( !isNodeDescValid( &pMsg->nodeDesc ) )
  	memset( &nodeDesc, 0xff, sizeof( nodeDesc ) );
  
        // make sure img desc is valid
!       memcpy(&pMsg->imgDesc, imgDesc, sizeof(DelugeImgDesc));
!       if ( !call Metadata.isImgDescValid( &pMsg->imgDesc ) ) {
  	imgDesc->vNum = DELUGE_INVALID_VNUM;
  	imgDesc->imgNum = imgNum;
--- 213,222 ----
  
        // make sure node desc is valid
!       if ( !isNodeDescValid( &nodeDesc ) )
  	memset( &nodeDesc, 0xff, sizeof( nodeDesc ) );
+       memcpy(&pMsg->nodeDesc, &nodeDesc, sizeof(DelugeNodeDesc));
  
        // make sure img desc is valid
!       if ( !call Metadata.isImgDescValid( imgDesc ) ) {
  	imgDesc->vNum = DELUGE_INVALID_VNUM;
  	imgDesc->imgNum = imgNum;
***************
*** 225,228 ****
--- 224,228 ----
  	imgDesc->numPgsComplete = 0;
        }
+       memcpy(&pMsg->imgDesc, imgDesc, sizeof(DelugeImgDesc));
  
        pMsg->numImages = DELUGE_NUM_IMAGES;