Index: trunk/Nebulous/nebclient/src/nebclient.c
===================================================================
--- trunk/Nebulous/nebclient/src/nebclient.c	(revision 4121)
+++ trunk/Nebulous/nebclient/src/nebclient.c	(revision 4440)
@@ -1,8 +1,8 @@
 /*
- * idataclient.c - idata client
+ * nebclient.c - nebulous client
  *
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.c,v 1.3 2005-06-06 21:21:05 jhoblitt Exp $
+ * $Id: nebclient.c,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
  */
 
@@ -18,17 +18,17 @@
 #include "soapH.h"
 #include "SOAP.nsmap"
-#include "idataclient.h"
+#include "nebclient.h"
 
 #define ERRBUF_SIZE 255
 
-static off_t idataCopyFile(char *source, char *dest);
-static off_t idataCopyFilehandle(int sourceFH, int destFH);
-
-void idataServerInit(idataServer *server)
+static off_t nebCopyFile(char *source, char *dest);
+static off_t nebCopyFilehandle(int sourceFH, int destFH);
+
+void nebServerInit(nebServer *server)
 {
     soap_init(server);
 }
 
-char *idataServerErr(idataServer *server)
+char *nebServerErr(nebServer *server)
 {
     char            *fault;
@@ -45,5 +45,5 @@
 }
 
-void idataServerCleanup(idataServer *server)
+void nebServerCleanup(nebServer *server)
 {
     soap_end(server); // remove deserialized data and clean up
@@ -51,5 +51,5 @@
 }
 
-int idataCreate(idataServer *server, char *key, unsigned int class, char *volume, char *comment, char **URI)
+int nebCreate(nebServer *server, char *key, unsigned int class, char *volume, char *comment, char **URI)
 {
     struct ns1__create_USCOREobjectResponse response;
@@ -61,5 +61,5 @@
         strcpy(*URI, response.result);
 
-        if (!idataParseURI(*URI, &filename)) {
+        if (!nebParseURI(*URI, &filename)) {
             fprintf(stderr, "can not parse URI\n");
 
@@ -81,5 +81,5 @@
 }
 
-int idataReplicate(idataServer *server, char *key, char *volume, char **URI )
+int nebReplicate(nebServer *server, char *key, char *volume, char **URI )
 {
     struct ns1__replicate_USCOREobjectResponse response;
@@ -91,5 +91,5 @@
         strcpy(*URI, response.result);
 
-        if (!idataParseURI(*URI, &filename)) {
+        if (!nebParseURI(*URI, &filename)) {
             fprintf(stderr, "can not parse URI\n");
 
@@ -97,5 +97,5 @@
         }
 
-        sourceFH = idataOpen(server, key, IDATA_READ);
+        sourceFH = nebOpen(server, key, NEB_READ);
         if (sourceFH == -1) {
             fprintf(stderr, "can not open key %s\n", key );
@@ -111,5 +111,5 @@
         }
 
-        idataCopyFilehandle(sourceFH, destFH);
+        nebCopyFilehandle(sourceFH, destFH);
 
         if (close(sourceFH) == -1) {
@@ -130,23 +130,23 @@
 }
 
-int idataCull( idataServer *server,char *key )
-{
-
-    return 0;
-}
-
-int idataLock(idataServer *server, char *key, rw flag )
-{
-
-    return 0;
-}
-
-int idataUnlock(idataServer *server, char *key, rw flag )
-{
-
-    return 0;
-}
-
-int idataFindInstances(idataServer *server, char *key, char *volume, char ***locations)
+int nebCull( nebServer *server,char *key )
+{
+
+    return 0;
+}
+
+int nebLock(nebServer *server, char *key, rw flag )
+{
+
+    return 0;
+}
+
+int nebUnlock(nebServer *server, char *key, rw flag )
+{
+
+    return 0;
+}
+
+int nebFindInstances(nebServer *server, char *key, char *volume, char ***locations)
 {
     struct ns1__find_USCOREinstancesResponse response;
@@ -179,53 +179,53 @@
 }
 
-int idataFind(idataServer *server, char *key )
-{
-
-    return 0;
-}
-
-int idataOpen(idataServer *server, char *key, rw flag )
-{
-
-    return 0;
-}
-
-int idataDelete(idataServer *server, char *key )
-{
-
-    return 0;
-}
-
-int idataCopy(idataServer *server, char *key, char *newKey )
-{
-
-    return 0;
-}
-
-int idataMove(idataServer *server, char *key, char *newKey )
-{
-
-    return 0;
-}
-
-int idataDelete_instance(idataServer *server, char *URI )
-{
-
-    return 0;
-}
-
-int idataStat(idataServer *server, char *key )
-{
-
-    return 0;
-}
-
-int idataErr(idataServer *server, char *errString )
-{
-
-    return 0;
-}
-
-int idataParseURI(const char *URI, char **filename)
+int nebFind(nebServer *server, char *key )
+{
+
+    return 0;
+}
+
+int nebOpen(nebServer *server, char *key, rw flag )
+{
+
+    return 0;
+}
+
+int nebDelete(nebServer *server, char *key )
+{
+
+    return 0;
+}
+
+int nebCopy(nebServer *server, char *key, char *newKey )
+{
+
+    return 0;
+}
+
+int nebMove(nebServer *server, char *key, char *newKey )
+{
+
+    return 0;
+}
+
+int nebDelete_instance(nebServer *server, char *URI )
+{
+
+    return 0;
+}
+
+int nebStat(nebServer *server, char *key )
+{
+
+    return 0;
+}
+
+int nebErr(nebServer *server, char *errString )
+{
+
+    return 0;
+}
+
+int nebParseURI(const char *URI, char **filename)
 {
     regex_t         myregex;
@@ -270,9 +270,9 @@
 }
 
-void idataFree(void *ptr) {
+void nebFree(void *ptr) {
     xfree(ptr);
 }
 
-static off_t idataCopyFile(char *source, char *dest)
+static off_t nebCopyFile(char *source, char *dest)
 {
     int             sourceFH;
@@ -294,5 +294,5 @@
     }
 
-    bytesCopied = idataCopyFilehandle(sourceFH, destFH);
+    bytesCopied = nebCopyFilehandle(sourceFH, destFH);
     if (bytesCopied < 0) {
         return -1;
@@ -314,5 +314,5 @@
 }
 
-static off_t idataCopyFilehandle(int sourceFH, int destFH)
+static off_t nebCopyFilehandle(int sourceFH, int destFH)
 {
     off_t           bytesTotal;