Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/Nebulous/nebclient/src/nebclient.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• Nebulous (modified) (1 prop)
• Nebulous/nebclient (modified) (1 prop)
• Nebulous/nebclient/src/nebclient.c (modified) (4 diffs)

branches/cnb_branches/cnb_branch_20090301/Nebulous/nebclient/src/nebclient.c

@@ -253 +253 @@
     }
 
-    if (!nebDeleteInstance(server, locations->URI[0])) {
+    if (!nebDeleteInstance(server, key, locations->URI[0])) {
         nebObjectInstancesFree(locations);
 
@@ -633 +633 @@
 
     for (int i = 0; i < locations->n; i++) {
-        if (!nebDeleteInstance(server, locations->URI[i])) {
+      if (!nebDeleteInstance(server, key, locations->URI[i])) {
             nebSetErr(server, "can not delete instance");
             nebObjectInstancesFree(locations);
@@ -749 +749 @@
 }
 
-bool nebDeleteInstance(nebServer *server, const char *URI)
+bool nebDeleteInstance(nebServer *server, const char *key, const char *URI)
 {
     int             response;
@@ -770 +770 @@
 
     if (soap_call_ns1__delete_USCOREinstance(server->soap, server->endpoint,
-            NULL, (char *)URI, &response) != SOAP_OK) {
+        NULL, (char *)key, (char *)URI, &response) != SOAP_OK) {
         nebFree(filename);