Changeset 4467

Timestamp:

Jul 6, 2005, 2:16:11 PM (21 years ago)

Author:

jhoblitt

Message:

change nebCull() to return bool
change nebCull() param key to be const
fill in nebCull() source

Location:

trunk/Nebulous/nebclient/src

Files:

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

trunk/Nebulous/nebclient/src/nebclient.c

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.c,v 1.8 2005-07-06 23:32:19 jhoblitt Exp $
+ * $Id: nebclient.c,v 1.9 2005-07-07 00:16:11 jhoblitt Exp $
  */
 
@@ -146 +146 @@
 }
 
-int nebCull(nebServer *server, char *key)
+bool nebCull(nebServer *server, const char *key)
 {
     char            **locations;
     int             n;
 
-    n = nebFindInstances(server, key, NULL, &locations);
-
-    printf( "found %d instances\n", n );
-
-    if (n < 2 ) {
+    if (nebFindInstances(server, (char *)key, NULL, &locations) < 2) {
         fprintf(stderr, "can not cull - not enough instances");
-        //free locations
-        return -1;
-    }
-
-    return nebDeleteInstance(server, locations[0]);
+
+        return false;
+    }
+
+    if (!nebDeleteInstance(server, locations[0])) {
+        nebFree(locations);
+
+        return false;
+    }
+
+    nebFree(locations);
+
+    return true;
 }
 

trunk/Nebulous/nebclient/src/nebclient.h

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.h,v 1.10 2005-07-06 23:32:19 jhoblitt Exp $
+ * $Id: nebclient.h,v 1.11 2005-07-07 00:16:11 jhoblitt Exp $
  */
 
@@ -26 +26 @@
 bool nebReplicate(nebServer *server, const char *key, const char *volume, char **URI);
 
-int nebCull(nebServer *server, char *key);
+bool nebCull(nebServer *server, const char *key);
 
 int nebLock(nebServer *server, char *key, rw flag);