Changeset 5661

Timestamp:

Dec 2, 2005, 1:49:08 PM (21 years ago)

Author:

jhoblitt

Message:

[nebclient] add nebOpenCreate()
[nebclient] change nebCreate() to return just a filename

Location:

trunk

Files:

• Nebulous-Server/Changes (modified) (1 diff)
• Nebulous/Changes (modified) (1 diff)
• Nebulous/nebclient/src/nebclient.c (modified) (6 diffs)
• Nebulous/nebclient/src/nebclient.h (modified) (3 diffs)
• Nebulous/nebclient/tests/tests.c (modified) (2 diffs)

trunk/Nebulous-Server/Changes

@@ -1 +1 @@
 Revision history for Perl module Poi::PixelData
+
+0.02
+    - [nebclient] add nebOpenCreate()
+    - [nebclient] change nebCreate() to return just a filename
 
 0.01 Fri Sep  3 10:23:31 2004

trunk/Nebulous/Changes

@@ -1 +1 @@
 Revision history for Perl module Poi::PixelData
+
+0.02
+    - [nebclient] add nebOpenCreate()
+    - [nebclient] change nebCreate() to return just a filename
 
 0.01 Fri Sep  3 10:23:31 2004

trunk/Nebulous/nebclient/src/nebclient.c

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.c,v 1.39 2005-07-30 02:43:38 jhoblitt Exp $
+ * $Id: nebclient.c,v 1.40 2005-12-02 23:49:08 jhoblitt Exp $
  */
 
@@ -83 +83 @@
 }
 
-int nebCreate(nebServer *server, const char *key, unsigned int class, const char *volume, const char *comment, char **URI)
+char *nebCreate(nebServer *server, const char *key, unsigned int class, const char *volume, const char *comment, char **URI)
 {
     struct ns1__create_USCOREobjectResponse response;
     char            *filename;
-    int             file;
-
-    REQUIRE_SERVER;
-
-    if (!key) {
-        nebSetErr(server, "parameter 'key' may not be NULL");
-
-        return -1;
+
+    REQUIRE_SERVER;
+
+    if (!key) {
+        nebSetErr(server, "parameter 'key' may not be NULL");
+
+        return NULL;
     }
 
@@ -102 +101 @@
         nebSetServerErr(server);
 
-        return -1;
+        return NULL;
     }
 
@@ -108 +107 @@
         nebSetErr(server, "can not parse URI");
 
-        return -1;
-    }
+        return NULL;
+    }
+
+    // if URI is not NULL
+    if (URI) {
+        *URI = xmalloc(strlen((char *)response.result));
+        strcpy(*URI, (char *)response.result);
+    }
+
+    return filename;
+}
+
+int nebOpenCreate(nebServer *server, const char *key, unsigned int class, const char *volume, const char *comment, char **URI)
+{
+    char            *filename;
+    int             file;
+
+    REQUIRE_SERVER;
+
+    if (!key) {
+        nebSetErr(server, "parameter 'key' may not be NULL");
+
+        return -1;
+    }
+
+    filename = nebCreate(server, key, class, volume, comment, URI);
 
     file = open(filename, O_RDWR|O_TRUNC, 0660);
@@ -120 +143 @@
 
     nebFree(filename);
-
-    // if URI is not NULL
-    if (URI) {
-        *URI = xmalloc(strlen((char *)response.result));
-        strcpy(*URI, (char *)response.result);
-    }
 
     return file;
@@ -501 +518 @@
     }
 
-    destFH = nebCreate(server, newKey, 0, NULL, NULL, NULL);
+    destFH = nebOpenCreate(server, newKey, 0, NULL, NULL, NULL);
     if (destFH < 0) {
         // propigate nebCreate() error

trunk/Nebulous/nebclient/src/nebclient.h

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.h,v 1.29 2005-07-29 02:48:20 jhoblitt Exp $
+ * $Id: nebclient.h,v 1.30 2005-12-02 23:49:08 jhoblitt Exp $
  */
 
@@ -72 +72 @@
 );
 
-/** Creates and opens new storage object
- *
- * @return A filehandle on success or a negative value on failure.
- */
-
-int nebCreate(
+/** Creates a new storage object
+ *
+ * @return A local filename
+ */
+
+char *nebCreate(
     nebServer *server,                  ///< nebServer object
     const char *key,                    ///< storage object key (name)
@@ -86 +86 @@
 );
 
+/** Creates and opens new storage object
+ *
+ * @return A filehandle on success or a negative value on failure.
+ */
+
+int nebOpenCreate(
+    nebServer *server,                  ///< nebServer object
+    const char *key,                    ///< storage object key (name)
+    unsigned int class,                 ///< storage object storage class
+    const char *volume,                 ///< preferred storage location of initial instance
+    const char *comment,                ///< storage object comment
+    char **URI                          ///< URL of initial instance, can be NULL
+);
+
 /** Adds an instance to a storage object
  *

trunk/Nebulous/nebclient/tests/tests.c

@@ -27 +27 @@
     char            *key = "foobarbaz";
 
-    TESTS(19);
+    TESTS(22);
 
     if (getenv("NEBULOUS_SERVER")) {
@@ -40 +40 @@
     {
         char        *URI = NULL;
+        char        *filename;
+       
+        filename = nebCreate(server, key, 0, NULL, NULL, &URI);
+
+        OK(filename, "create object");
+        OK(URI, "URI not NULL");
+        OK(nebDelete(server, key), "delete object");
+
+        nebFree(URI);
+        nebFree(filename);
+    }
+
+    {
+        char        *URI = NULL;
         int         fh;
        
-        fh = nebCreate(server, key, 0, NULL, NULL, &URI);
+        fh = nebOpenCreate(server, key, 0, NULL, NULL, &URI);
 
-        OK(fh > -1, "create object");
+        OK(fh > -1, "create new object filehandle");
         OK(URI, "URI not NULL");