Changeset 4523 for trunk/Nebulous/nebclient

Timestamp:

Jul 8, 2005, 2:02:20 PM (21 years ago)

Author:

jhoblitt

Message:

reorganize nebFindInstacnes()

File:

• trunk/Nebulous/nebclient/src/nebclient.c (modified) (2 diffs)

trunk/Nebulous/nebclient/src/nebclient.c

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.c,v 1.21 2005-07-08 22:04:05 jhoblitt Exp $
+ * $Id: nebclient.c,v 1.22 2005-07-09 00:02:20 jhoblitt Exp $
  */
 
@@ -206 +206 @@
 
     // FIXME is this leaking memory when response goes out of scope?
-    if (soap_call_ns1__find_USCOREinstances(server->soap, NULL, NULL, (char *)key, (char *)volume, &response) == SOAP_OK) {
-
-        resultElements = response.result->__size;
-        resultArray    = response.result->__ptr;
-
-        loc = xmalloc(sizeof(char*) * resultElements);
-
-        for (i = 0; i < resultElements; i++) {
-            loc[i] = xmalloc(strlen(resultArray[i]) + 1);
-
-            strcpy(loc[i], resultArray[i]);
-        }
-
-        *locations = loc;
-
-        return resultElements;
-    }
-
-    // server error
-    return -1;
+    if (soap_call_ns1__find_USCOREinstances(server->soap, NULL, NULL,
+            (char *)key, (char *)volume, &response) != SOAP_OK) {
+        nebSetServerErr(server);
+        return -1;
+    }
+
+    resultElements = response.result->__size;
+    resultArray    = response.result->__ptr;
+
+    loc = xmalloc(sizeof(char*) * resultElements);
+
+    for (i = 0; i < resultElements; i++) {
+        loc[i] = xmalloc(strlen(resultArray[i]) + 1);
+
+        strcpy(loc[i], resultArray[i]);
+    }
+
+    *locations = loc;
+
+    return resultElements;
 }