Changeset 4492

Timestamp:

Jul 6, 2005, 4:08:12 PM (21 years ago)

Author:

jhoblitt

Message:

remove unused var (n) from nebCull()
change nebDelete() to return bool
change nebDelete() param key to const
fill in nebDelete()
fix segfault in nebDeleteInstance()
change nebParseURI to check if URI is NULL

Location:

trunk/Nebulous/nebclient/src

Files:

• nebclient.c (modified) (7 diffs)
• nebclient.h (modified) (2 diffs)

trunk/Nebulous/nebclient/src/nebclient.c

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.c,v 1.9 2005-07-07 00:16:11 jhoblitt Exp $
+ * $Id: nebclient.c,v 1.10 2005-07-07 02:08:12 jhoblitt Exp $
  */
 
@@ -149 +149 @@
 {
     char            **locations;
-    int             n;
 
     if (nebFindInstances(server, (char *)key, NULL, &locations) < 2) {
@@ -252 +251 @@
 }
 
-int nebDelete(nebServer *server, char *key )
-{
-
-    return 0;
+bool nebDelete(nebServer *server, const char *key)
+{
+    char            **locations;
+    int             n;
+    int             i;
+
+    n = nebFindInstances(server, (char *)key, NULL, &locations);
+
+    if (n < 0) {
+        fprintf(stderr, "no instances found\n");
+        nebFree(locations);
+
+        return false;
+    }
+
+    for (i = 0; i < n; i++) {
+        printf("nebDelete location is: %s\n", locations[i]);
+
+        if (!nebDeleteInstance(server, locations[i])) {
+            nebFree(locations);
+
+            return false;
+        }
+    }
+
+    nebFree(locations);
+
+    return true;
 }
 
@@ -272 +295 @@
 bool nebDeleteInstance(nebServer *server, const char *URI)
 {
-    int             *response;
+    int             response;
     char            *filename;
     bool            status;
@@ -282 +305 @@
     }
 
-    if (soap_call_ns1__delete_USCOREinstance(server, NULL, NULL, (char *)URI, response) != SOAP_OK) {
+    if (soap_call_ns1__delete_USCOREinstance(server, NULL, NULL, (char *)URI, &response) != SOAP_OK) {
         nebFree(filename);
 
@@ -288 +311 @@
     }
 
-    if (*response > 0) {
+    if (response > 0) {
         status = nebNukeFile(filename);
     } else {
@@ -321 +344 @@
     int             matchLength;
 
+    if (!URI) {
+        return 0;
+    }
+
     status = regcomp(&myregex, pattern, REG_EXTENDED);
     if (status != 0) {

trunk/Nebulous/nebclient/src/nebclient.h

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.h,v 1.11 2005-07-07 00:16:11 jhoblitt Exp $
+ * $Id: nebclient.h,v 1.12 2005-07-07 02:08:12 jhoblitt Exp $
  */
 
@@ -38 +38 @@
 int nebOpen(nebServer *server, const char *key, rw flag);
 
-int nebDelete(nebServer *server, char *key);
+bool nebDelete(nebServer *server, const char *key);
 
 int nebCopy(nebServer *server, char *key, char *newKey);