[Sblim-commit] sfcb providerDrv.c,1.14,1.15 xmltest,1.2,1.3

[Gareth S B. <bes...@us...>]

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

Modified Files:
	providerDrv.c xmltest 
Log Message:
fixed couple of debug messages in providerDrv.c
fix for http://sourceforge.net/tracker/index.php?func=detail&aid=1215943&group_id=128809&atid=712784



Index: xmltest
===================================================================
RCS file: /cvsroot/sblim/sfcb/xmltest,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xmltest	2 Jun 2005 20:22:54 -0000	1.2
+++ xmltest	9 Jun 2005 21:10:35 -0000	1.3
@@ -29,7 +29,7 @@
    exit 1
 fi
 
-# ------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 function _runxmltest {
    typeset _TESTXML=$1
 
@@ -49,15 +49,17 @@
    # Remove any old test result file
    rm -f $_TESTRESULT
 
-   # Send the test CIM-XML to the CIMOM and save the response, stripping off the http header
-   wbemcat $_TESTXML | awk "{i++; if (i>7) print}" > $_TESTRESULT
+   # Send the test CIM-XML to the CIMOM and save the response, 
+   # stripping off the http header
+   wbemcat $_TESTXML | awk '/<\?xml.*/{xml=1} {if (xml) print}' > $_TESTRESULT
    if [[ $? -ne 0 ]]; then
       echo "FAILED"; echo -e "\twbemcat failed to send CIM-XML request"
       _RC=1
       continue
    fi
 
-   # If we dont yet have the expected result file, then save this response as the (new) expected result
+   # If we dont yet have the expected result file, then save this response 
+   # as the (new) expected result
    if [[ ! -f $_TESTOK ]]; then
       echo "OK"; echo -e "\tSaving response as $_TESTOK"
       mv $_TESTRESULT $_TESTOK
@@ -74,7 +76,7 @@
       rm -f $_TESTRESULT
    fi
 }
-# ------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------
 
 if [[ -f $1 ]]; then
    _runxmltest $1
@@ -85,7 +87,8 @@
       _DIR=./
    fi
 
-   # Look for all *.xml test files and run them in sorted order (hence tests should be numbered)
+   # Look for all *.xml test files and run them in sorted order,
+   # hence tests should be numbered
    find $_DIR -name "*.xml" | sort | while read _TESTXML; do
       _runxmltest $_TESTXML
       # Wait for the dust to settle before trying the next test...

Index: providerDrv.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/providerDrv.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- providerDrv.c	30 May 2005 01:32:24 -0000	1.14
+++ providerDrv.c	9 Jun 2005 21:10:34 -0000	1.15
@@ -419,7 +419,7 @@
             curProvProc=(*proc);
             resultSockets=sPairs[(*proc)->id+ptBase];
 
-            _SFCB_TRACE(1,("--- Forked started for %s %d %d-%lu\n",
+            _SFCB_TRACE(1,("--- Forked started for %s %d %d-%lu",
                          info->providerName, currentProc,providerSockets.receive,
                          getInode(providerSockets.receive)));
             processName=info->providerName;
@@ -440,7 +440,7 @@
          else {
            info->startSeq=++seq;
          }
-         _SFCB_TRACE(1,("--- Fork provider OK %s %d %d\n", info->providerName,
+         _SFCB_TRACE(1,("--- Fork provider OK %s %d %d", info->providerName,
                       info->pid, i));
          _SFCB_RETURN(info->pid);
       }