[Sblim-commit] sfcc cimXmlResp.c,1.4,1.5 cimXmlResp.y,1.4,1.5 test.c,1.10,1.11

[Adrian S. <a3s...@us...>]

Update of /cvsroot/sblim/sfcc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5277

Modified Files:
	cimXmlResp.c cimXmlResp.y test.c 
Log Message:
Removed trace from cimXmlResp.y
Fixed getClass test in test.c


Index: test.c
===================================================================
RCS file: /cvsroot/sblim/sfcc/test.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- test.c	20 Jun 2005 15:04:18 -0000	1.10
+++ test.c	20 Jun 2005 15:17:02 -0000	1.11
@@ -68,7 +68,9 @@
       for (i=0; i<numproperties; i++) {
          CMPIString * propertyname;
          CMPIData data = class->ft->getPropertyAt(class, i, &propertyname, NULL);
-         printf("\t%s=%s\n", (char *)propertyname->hdl, value2Chars(data.type, &data.value));
+         if (data.state==0)
+            printf("\t%s=%s\n", (char *)propertyname->hdl, value2Chars(data.type, &data.value));
+         else printf("\t%s=NIL\n", (char *)propertyname->hdl);
       }
    }
 
@@ -128,7 +130,7 @@
       if (objectpath) CMRelease(objectpath);
    }
 
-   if (0) {
+   if (1) {
       /* Test getClass() */
       printf("\n----------------------------------------------------------\n");
       printf("Testing getClass() ...\n");
@@ -141,7 +143,7 @@
          printf("result:\n");
          showClass(class);
       }
-      if (instance) CMRelease(instance);
+      if (class) CMRelease(class);
       if (objectpath) CMRelease(objectpath);
    }
 

Index: cimXmlResp.y
===================================================================
RCS file: /cvsroot/sblim/sfcc/cimXmlResp.y,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cimXmlResp.y	20 Jun 2005 15:04:18 -0000	1.4
+++ cimXmlResp.y	20 Jun 2005 15:17:02 -0000	1.5
@@ -566,7 +566,7 @@
        simpleArrayAdd(PARM->respHdr.rvArray,(CMPIValue*)&PARM->curInstance,CMPI_instance);
        PARM->curInstance=NULL;
     }    
-    | objectsWithPath objectWithPath
+    | objectsWithPath objectWithPath 
     {
        PARM->curInstance=native_new_CMPIInstance(NULL,NULL);
        setInstNsAndCn(PARM->curInstance,PARM->nameSpace,$2.instance.className);
@@ -953,14 +953,12 @@
        $$.bindings.next=0;
        $$.bindings.keyBindings=NULL;
        PARM->curPath=NULL;
-       fprintf(stderr,"### instanceName 0\n");
     }
     | XTOK_INSTANCENAME keyBindings ZTOK_INSTANCENAME
     {
        $$.className=$1.className;
        $$.bindings=$2;
        createPath(&(PARM->curPath), &$$);
-       fprintf(stderr,"### instanceName 1\n");
     }
 ;
 

Index: cimXmlResp.c
===================================================================
RCS file: /cvsroot/sblim/sfcc/cimXmlResp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cimXmlResp.c	20 Jun 2005 15:04:18 -0000	1.4
+++ cimXmlResp.c	20 Jun 2005 15:17:02 -0000	1.5
@@ -698,7 +698,7 @@
      696,   708,   709,   714,   727,   731,   735,   742,   743,   747,
      753,   758,   782,   789,   796,   804,   809,   824,   826,   831,
      839,   850,   854,   868,   875,   879,   892,   900,   906,   950,
-     958,   968,   978,   989,   995
+     957,   966,   976,   987,   993
 };
 #endif
 
@@ -2001,22 +2001,20 @@
        yyval.xtokInstanceName.bindings.next=0;
        yyval.xtokInstanceName.bindings.keyBindings=NULL;
        PARM->curPath=NULL;
-       fprintf(stderr,"### instanceName 0\n");
     }
     break;
 
   case 70:
-#line 959 "cimXmlResp.y"
+#line 958 "cimXmlResp.y"
     {
        yyval.xtokInstanceName.className=yyvsp[-2].xtokInstanceName.className;
        yyval.xtokInstanceName.bindings=yyvsp[-1].xtokKeyBindings;
        createPath(&(PARM->curPath), &yyval.xtokInstanceName);
-       fprintf(stderr,"### instanceName 1\n");
     }
     break;
 
   case 71:
-#line 969 "cimXmlResp.y"
+#line 967 "cimXmlResp.y"
     {
        yyval.xtokKeyBindings.next=1;
        yyval.xtokKeyBindings.max=16;
@@ -2029,7 +2027,7 @@
     break;
 
   case 72:
-#line 979 "cimXmlResp.y"
+#line 977 "cimXmlResp.y"
     {
        yyval.xtokKeyBindings.keyBindings[yyval.xtokKeyBindings.next].name=yyvsp[0].xtokKeyBinding.name;
        yyval.xtokKeyBindings.keyBindings[yyval.xtokKeyBindings.next].value=yyvsp[0].xtokKeyBinding.value;
@@ -2040,7 +2038,7 @@
     break;
 
   case 73:
-#line 990 "cimXmlResp.y"
+#line 988 "cimXmlResp.y"
     {
        yyval.xtokKeyBinding.name=yyvsp[-3].xtokKeyBinding.name;
        yyval.xtokKeyBinding.value=yyvsp[-2].xtokKeyValue.value;
@@ -2049,7 +2047,7 @@
     break;
 
   case 74:
-#line 996 "cimXmlResp.y"
+#line 994 "cimXmlResp.y"
     {
        yyval.xtokKeyBinding.name=yyvsp[-2].xtokKeyBinding.name;
        yyval.xtokKeyBinding.value=NULL;
@@ -2062,7 +2060,7 @@
     }
 
 /* Line 999 of yacc.c.  */
-#line 2065 "cimXmlResp.c"
+#line 2063 "cimXmlResp.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -2256,6 +2254,6 @@
 }
 
 
-#line 1004 "cimXmlResp.y"
+#line 1002 "cimXmlResp.y"