[Sblim-commit] sfcb ChangeLog, 1.769, 1.770 indCIMXMLExport.c, 1.15, 1.16 NEWS, 1.689, 1.690

[Narasimha S. <nsh...@us...>]

Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv17700

Modified Files:
	ChangeLog indCIMXMLExport.c NEWS 
Log Message:
[ 3527920 ] RI and http responsecodes

Singed-off-by: Narasimha Sharoff <nsh...@us...>


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.689
retrieving revision 1.690
diff -u -d -r1.689 -r1.690
--- NEWS	18 May 2012 23:46:01 -0000	1.689
+++ NEWS	21 May 2012 17:22:37 -0000	1.690
@@ -7,6 +7,7 @@
 - 3501314 Add dynamic logging and syslog output to sfcb trace
 - 3517530 Implement mark, release routines in CMPIBrokerMemFT
 - 3513390 Enforce LD and subscription limits
+- 3527920 RI and http responsecodes
 
 Bugs fixed:
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.769
retrieving revision 1.770
diff -u -d -r1.769 -r1.770
--- ChangeLog	18 May 2012 23:46:01 -0000	1.769
+++ ChangeLog	21 May 2012 17:22:37 -0000	1.770
@@ -1,3 +1,8 @@
+2012-05-21  Narasimha Sharoff  <nsh...@us...>
+
+	* indCIMXMLExport.c, indCIMXMLHander.c:
+	[ 3527920 ] RI and http response codes
+
 2012-05-18  Chris Buccella  <buc...@li...>
 
 	* objectImpl.c:

Index: indCIMXMLExport.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/indCIMXMLExport.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- indCIMXMLExport.c	28 Feb 2012 21:36:16 -0000	1.15
+++ indCIMXMLExport.c	21 May 2012 17:22:37 -0000	1.16
@@ -266,21 +266,31 @@
 
     rv = curl_easy_perform(cd->mHandle);
     if (rv) {
-        long responseCode = -1;
+        int responseCode = -1;
         char *error;
         // Use CURLINFO_HTTP_CODE instead of CURLINFO_RESPONSE_CODE
         // (more portable to older versions of curl)
         curl_easy_getinfo(cd->mHandle, CURLINFO_HTTP_CODE, &responseCode);
-        if (responseCode == 401) {
+        rc = responseCode; /* set the return code */
+        switch(responseCode) {
+          case 200:
+             rc = 0; /* HTTP 200 is OK. set rc to 0 */
+             break;
+          case 400:
+             *msg = strdup("Bad Request");
+             break;
+          case 401:
             error = (cd->mUserPass) ? "Invalid username/password." :
                                      "Username/password required.";
-            *msg=strdup(error);                         
-            rc=3;
+             *msg = strdup(error);
+             break;
+          case 501:
+             *msg = strdup("Not Implemented");
+             break;
+          default:
+             *msg = getErrorMessage(rv);
+             break;
         }
-        else {
-           rc=4;
-           *msg = getErrorMessage(rv);
-        }    
         return rc;
     }