Changeset 4522

Timestamp:

Jul 8, 2005, 12:04:05 PM (21 years ago)

Author:

jhoblitt

Message:

change nebNukeFile() to take a server param
change nebSetErr() & nebSetServerErr() to return void
change nebSetErr() to abort() on failure

File:

• trunk/Nebulous/nebclient/src/nebclient.c (modified) (8 diffs)

trunk/Nebulous/nebclient/src/nebclient.c

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.c,v 1.20 2005-07-08 21:55:38 jhoblitt Exp $
+ * $Id: nebclient.c,v 1.21 2005-07-08 22:04:05 jhoblitt Exp $
  */
 
@@ -25 +25 @@
 #define ERRBUF_SIZE 2048
 
-static bool nebSetErr(nebServer *server, const char *format, ...);
-static bool nebSetServerErr(nebServer *server);
+static void nebSetErr(nebServer *server, const char *format, ...);
+static void nebSetServerErr(nebServer *server);
 static off_t nebCopyFile(nebServer *server, const char *source, const char *dest);
 static off_t nebCopyFilehandle(nebServer *server, int sourceFH, int destFH);
 static int nebParseURI(nebServer *server, const char *URI, char **filename);
-static bool nebNukeFile(const char *filename);
+static bool nebNukeFile(nebServer *server, const char *filename);
 
 nebServer *nebServerAlloc(void)
@@ -383 +383 @@
 
     if (response > 0) {
-        status = nebNukeFile(filename);
+        status = nebNukeFile(server, filename);
     } else {
         status = false;
@@ -408 +408 @@
 }
 
-static bool nebSetErr(nebServer *server, const char *format, ...)
+static void nebSetErr(nebServer *server, const char *format, ...)
 {
     va_list         args;
@@ -421 +421 @@
             fprintf(stderr, "failed to set error message");
 
-            return false;
+            abort();
         }
 
         if (err_size < server->err_buf_size) {
-            return true;
+            break;
         }
 
@@ -438 +438 @@
 }
 
-static bool nebSetServerErr(nebServer *server)
+static void nebSetServerErr(nebServer *server)
 {
     const char      **code;
@@ -446 +446 @@
     string = soap_faultstring(server->soap);
 
-    return nebSetErr(server, "%s - %s", *code, *string);
+    nebSetErr(server, "%s - %s", *code, *string);
 }
 
@@ -586 +586 @@
 }
 
-static bool nebNukeFile(const char *filename)
+static bool nebNukeFile(nebServer *server, const char *filename)
 {
     if (unlink(filename) < 0) {
-        perror("unlink");
-
-        return false;
-    }
-             
+        nebSetErr(server, "unlink: %s", strerror(errno));
+
+        return false;
+    }
+
     return true;
 }