Changeset 4465

Timestamp:

Jul 6, 2005, 11:41:03 AM (21 years ago)

Author:

jhoblitt

Message:

change nebReplicate() to return bool
change nebReplicate() params key & volume to be const
change nebReplicate() to probably actually work

Location:

trunk/Nebulous/nebclient/src

Files:

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

trunk/Nebulous/nebclient/src/nebclient.c

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.c,v 1.6 2005-07-06 04:14:41 jhoblitt Exp $
+ * $Id: nebclient.c,v 1.7 2005-07-06 21:41:03 jhoblitt Exp $
  */
 
@@ -85 +85 @@
 }
 
-int nebReplicate(nebServer *server, char *key, char *volume, char **URI )
+bool nebReplicate(nebServer *server, const char *key, const char *volume, char **URI)
 {
     struct ns1__replicate_USCOREobjectResponse response;
@@ -91 +91 @@
     int             sourceFH, destFH;
 
-    if (soap_call_ns1__replicate_USCOREobject(server, NULL, NULL, key, volume, (char **)&response) == SOAP_OK) {
+    if (soap_call_ns1__replicate_USCOREobject(server, NULL, NULL, (char *)key, (char *)volume, (char **)&response) != SOAP_OK) {
+        // server error
+        return false;
+    }
+
+    if (!nebParseURI((char *)response.result, &filename)) {
+        fprintf(stderr, "can not parse URI\n");
+
+        return false;
+    }
+
+    // if URI is not NULL
+    if (URI) {
         *URI = xmalloc(strlen((char *)response.result));
         strcpy(*URI, (char *)response.result);
-
-        if (!nebParseURI(*URI, &filename)) {
-            fprintf(stderr, "can not parse URI\n");
-
-            return 0;
-        }
-
-        sourceFH = nebOpen(server, key, NEB_READ);
-        if (sourceFH == -1) {
-            fprintf(stderr, "can not open key %s\n", key );
-
-            return -1;
-        }
-
-        destFH = open(filename, O_RDWR|O_TRUNC, 0660);
-        if (destFH == -1) {
-            fprintf(stderr, "can not open %s: %s\n", filename, strerror(errno));
-
-            return -1;
-        }
-
-        nebCopyFilehandle(sourceFH, destFH);
-
-        if (close(sourceFH) == -1) {
-            fprintf(stderr, "can not close file: %s", strerror(errno));
-
-            return -1;
-        }
-
-        if (close(destFH) == -1) {
-            fprintf(stderr, "can not close %s: %s", filename, strerror(errno));
-
-            return -1;
-        }
-    }
-
-    // server error
-    return -1;
+    }
+
+    // need a read lock
+    sourceFH = nebOpen(server, (char *)key, NEB_READ);
+    if (sourceFH == -1) {
+        fprintf(stderr, "can not open key %s\n", key );
+        nebFree(filename);
+
+        return false;
+    }
+
+    destFH = open(filename, O_RDWR|O_TRUNC, 0660);
+    if (destFH == -1) {
+        fprintf(stderr, "can not open %s: %s\n", filename, strerror(errno));
+        nebFree(filename);
+
+        return false;
+    }
+
+    nebCopyFilehandle(sourceFH, destFH);
+
+    if (close(sourceFH) == -1) {
+        fprintf(stderr, "can not close file: %s", strerror(errno));
+        nebFree(filename);
+
+        return false;
+    }
+
+    if (close(destFH) == -1) {
+        fprintf(stderr, "can not close %s: %s", filename, strerror(errno));
+        nebFree(filename);
+
+        return false;
+    }
+
+    nebFree(filename);
+
+    return true;
 }
 

trunk/Nebulous/nebclient/src/nebclient.h

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.h,v 1.8 2005-07-06 04:12:50 jhoblitt Exp $
+ * $Id: nebclient.h,v 1.9 2005-07-06 21:41:03 jhoblitt Exp $
  */
 
@@ -24 +24 @@
 int nebCreate(nebServer *server, char *key, unsigned int class, char *volume, char *comment, char **URI);
 
-int nebReplicate(nebServer *server, char *key, char *volume, char **URI);
+bool nebReplicate(nebServer *server, const char *key, const char *volume, char **URI);
 
 int nebCull(nebServer *server, char *key);