[Linuxisns-commit] isnsNT/isnsserver/src iSNSquery.c, 1.30, 1.31 iSNSreg.c, 1.32, 1.33

[Robert W. <wrw...@us...>]

Update of /cvsroot/linuxisns/isnsNT/isnsserver/src
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30922/src

Modified Files:
	iSNSquery.c iSNSreg.c 
Log Message:
fix compiler warnings

Index: iSNSreg.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSreg.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** iSNSreg.c	27 Aug 2007 22:49:05 -0000	1.32
--- iSNSreg.c	28 Aug 2007 17:49:06 -0000	1.33
***************
*** 2840,2844 ****
  
     ISNSParseMsg( &p_md->msg, attr_indx, key_indx, NULL );
!    if ( key_indx && key_indx[ 0 ] == NULL )
     {
        __DEBUG( isns_reg_debug & 1, (Missing key) );
--- 2840,2844 ----
  
     ISNSParseMsg( &p_md->msg, attr_indx, key_indx, NULL );
!    if ( key_indx[0] == NULL )
     {
        __DEBUG( isns_reg_debug & 1, (Missing key) );

Index: iSNSquery.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSquery.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** iSNSquery.c	27 Aug 2007 22:49:05 -0000	1.30
--- iSNSquery.c	28 Aug 2007 17:49:06 -0000	1.31
***************
*** 1713,1724 ****
           }
  
!          ISNSAppendKey (p_rspmsg, ISNS_DD_ID,
!                          ISNS_DD_ID_SIZE, NULL, p_dd->id);
! 
!          if (attr_indx && attr_indx[0])
!          {
!             ISNSAppendKey (p_rspmsg, 0, 0, NULL, 0);
!             ISNSdbProcessDDOpAttr (p_rspmsg, (ISNS_Attr **)attr_indx, p_dd);
!          }
  
           found=TRUE;
--- 1713,1719 ----
           }
  
!          ISNSAppendKey (p_rspmsg, ISNS_DD_ID, ISNS_DD_ID_SIZE, NULL, p_dd->id);
!          ISNSAppendKey (p_rspmsg, 0, 0, NULL, 0);
!          ISNSdbProcessDDOpAttr (p_rspmsg, (ISNS_Attr **)attr_indx, p_dd);
  
           found=TRUE;
***************
*** 1755,1767 ****
           }
  
! 
!          ISNSAppendKey (p_rspmsg, ISNS_DDS_ID,
!                          ISNS_DDS_ID_SIZE, NULL, p_dds->id);
! 
!          if (attr_indx && attr_indx[0])
!          {
!             ISNSAppendKey (p_rspmsg, 0, 0, NULL, 0);
!             ISNSdbProcessDDSOpAttr (p_rspmsg, (ISNS_Attr **)attr_indx, p_dds);
!          }
  
           found=TRUE;
--- 1750,1756 ----
           }
  
!          ISNSAppendKey (p_rspmsg, ISNS_DDS_ID,ISNS_DDS_ID_SIZE, NULL, p_dds->id);
!          ISNSAppendKey (p_rspmsg, 0, 0, NULL, 0);
!          ISNSdbProcessDDSOpAttr (p_rspmsg, (ISNS_Attr **)attr_indx, p_dds);
  
           found=TRUE;
***************
*** 1827,1835 ****
                           PAD4 (strlen ((char *)&qkey.val)), (char *)&qkey.val, 0);
  
!          if (attr_indx && attr_indx[0])
!          {
!             ISNSAppendKey (p_rspmsg, 0, 0, NULL, 0);
!             ISNSdbProcessISCSIOpAttr (p_rspmsg, (ISNS_Attr **)attr_indx, p_node);
!          }
           found=TRUE;
        }
--- 1816,1821 ----
                           PAD4 (strlen ((char *)&qkey.val)), (char *)&qkey.val, 0);
  
!          ISNSAppendKey (p_rspmsg, 0, 0, NULL, 0);
!          ISNSdbProcessISCSIOpAttr (p_rspmsg, (ISNS_Attr **)attr_indx, p_node);
           found=TRUE;
        }
***************
*** 1891,1899 ****
                           PAD4 (strlen (p_entity->eid.id)), p_entity->eid.id, 0);
  
!          if (attr_indx && attr_indx[0])
!          {
!             ISNSAppendKey (p_rspmsg, 0, 0, NULL, 0);
!             ISNSdbProcessEntityOpAttr (p_rspmsg, (ISNS_Attr **)attr_indx, p_entity);
!          }
  
           found=TRUE;
--- 1877,1882 ----
                           PAD4 (strlen (p_entity->eid.id)), p_entity->eid.id, 0);
  
!          ISNSAppendKey (p_rspmsg, 0, 0, NULL, 0);
!          ISNSdbProcessEntityOpAttr (p_rspmsg, (ISNS_Attr **)attr_indx, p_entity);
  
           found=TRUE;
***************
*** 1931,1939 ****
                           ISNS_PORT_NAME_SIZE, (char *)&qkey.val, 0);
  
!          if (attr_indx && attr_indx[0])
!          {
!             ISNSAppendKey (p_rspmsg, 0, 0, NULL, 0);
!             ISNSdbProcessPortOpAttr (p_rspmsg, (ISNS_Attr **)attr_indx, p_port);
!          }
  
           found=TRUE;
--- 1914,1919 ----
                           ISNS_PORT_NAME_SIZE, (char *)&qkey.val, 0);
  
!          ISNSAppendKey (p_rspmsg, 0, 0, NULL, 0);
!          ISNSdbProcessPortOpAttr (p_rspmsg, (ISNS_Attr **)attr_indx, p_port);
  
           found=TRUE;
***************
*** 2000,2014 ****
           }
  
!          ISNSAppendKey (p_rspmsg, ISNS_PORTAL_IP,
!                          ISNS_PORTAL_IP_SIZE, (char *)&qkey.val, 0);
! 
           ISNSAppendKey (p_rspmsg, ISNS_PORTAL_PORT,
                           ISNS_PORTAL_PORT_SIZE, (char *)&qkey.val + ISNS_PORTAL_IP_SIZE, 0);
  
!          if (attr_indx && attr_indx[0])
!          {
!             ISNSAppendKey (p_rspmsg, 0, 0, NULL, 0);
!             SNSProcessPortalOpAttr (p_rspmsg, (ISNS_Attr **)attr_indx, p_portal);
!          }
  
           found=TRUE;
--- 1980,1989 ----
           }
  
!          ISNSAppendKey (p_rspmsg, ISNS_PORTAL_IP,ISNS_PORTAL_IP_SIZE,(char *)&qkey.val, 0);
           ISNSAppendKey (p_rspmsg, ISNS_PORTAL_PORT,
                           ISNS_PORTAL_PORT_SIZE, (char *)&qkey.val + ISNS_PORTAL_IP_SIZE, 0);
  
!          ISNSAppendKey (p_rspmsg, 0, 0, NULL, 0);
!          SNSProcessPortalOpAttr (p_rspmsg, (ISNS_Attr **)attr_indx, p_portal);
  
           found=TRUE;
***************
*** 2444,2447 ****
--- 2419,2426 ----
           case ISNS_ESI_PORT:
           case ISNS_PORTAL_CERT:
+          case ISNS_PORTAL_GROUP_TAG:
+          case ISNS_PORTAL_GROUP_IP:
+          case ISNS_PORTAL_GROUP_PORT:
+          case ISNS_PORTAL_GROUP_ISCSI_NAME:
              fetchPortalFlag = TRUE;
              break;
***************
*** 2508,2512 ****
           break;
  
-       /* Located in the Entity object */
        case ISNS_MGMT_IP:
           ISNSAppendAttr ( (struct ISNS_msg *) p_msg, ISNS_MGMT_IP, ISNS_IP_SIZE,
--- 2487,2490 ----