Changeset 4506 for trunk/Nebulous/nebclient

Timestamp:

Jul 7, 2005, 12:47:40 PM (21 years ago)

Author:

jhoblitt

Message:

add nebSetErr()
add nebSetServerErr()
remove nebServerErr()
change nebErr() to return char *
change nebErr() params to be only server
add nebErr() src
rework nebServer struct

Location:

trunk/Nebulous/nebclient/src

Files:

• nebclient.c (modified) (7 diffs)
• nebclient.h (modified) (3 diffs)
• test.c (modified) (1 diff)

trunk/Nebulous/nebclient/src/nebclient.c

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.c,v 1.11 2005-07-07 21:41:15 jhoblitt Exp $
+ * $Id: nebclient.c,v 1.12 2005-07-07 22:47:40 jhoblitt Exp $
  */
 
@@ -17 +17 @@
 #include <unistd.h>
 #include <stdbool.h>
+#include <stdarg.h>
 #include "xmalloc.h"
 #include "soapH.h"
@@ -24 +25 @@
 #define ERRBUF_SIZE 2048
 
+static bool nebSetErr(nebServer *server, const char *format, ...);
+static bool nebSetServerErr(nebServer *server);
 static off_t nebCopyFile(char *source, char *dest);
 static off_t nebCopyFilehandle(int sourceFH, int destFH);
@@ -35 +38 @@
     server          = xmalloc(sizeof(nebServer));
     server->soap    = xmalloc(sizeof(struct soap));
-    server->err_msg = xmalloc(ERRBUF_SIZE);
+    server->err_buf = xmalloc(ERRBUF_SIZE);
+    server->err_buf_size = ERRBUF_SIZE;
 
     soap_init(server->soap);
 
     return server;
-}
-
-char *nebServerErr(nebServer *server)
-{
-    char            *fault;
-    const char      **code;
-    const char      **string;
-
-    code   = soap_faultcode(server->soap);
-    string = soap_faultstring(server->soap);
-
-    fault = xmalloc(strlen(*code) + 3 + strlen(*string) + 1);
-    sprintf(fault, "%s - %s", *code, *string);
-
-    return fault;
 }
 
@@ -63 +52 @@
 
     nebFree(server->soap);
-    nebFree(server->err_msg);
+    nebFree(server->err_buf);
     nebFree(server);
 }
@@ -94 +83 @@
 
     // server error
+    nebSetServerErr(server);
+
     return -1;
 }
@@ -339 +330 @@
 }
 
-int nebErr(nebServer *server, char *errString )
-{
-
-    return 0;
+char *nebErr(nebServer *server)
+{
+    return server->err_buf;
+}
+
+static bool nebSetErr(nebServer *server, const char *format, ...)
+{
+    va_list         args;
+    size_t          err_size;
+
+    while (1) {
+        va_start(args, format);
+        err_size = vsnprintf(server->err_buf, server->err_buf_size, format, args);
+        va_end(args);
+
+        if (err_size < 0) {
+            fprintf(stderr, "failed to set error message\n");
+
+            return false;
+        }
+
+        if (err_size < server->err_buf_size) {
+            return true;
+        }
+
+        // else: expand err_buf
+        fprintf(stderr, "error buffer is too small, expanding\n");
+
+        // account for '\0'
+        server->err_buf_size = err_size + 1;
+        xrealloc(server->err_buf, server->err_buf_size);
+    }
+
+}
+
+static bool nebSetServerErr(nebServer *server)
+{
+    const char      **code;
+    const char      **string;
+
+    code   = soap_faultcode(server->soap);
+    string = soap_faultstring(server->soap);
+
+    return nebSetErr(server, "%s - %s", *code, *string);
 }
 

trunk/Nebulous/nebclient/src/nebclient.h

@@ -4 +4 @@
  * Copyright (C) 2005  Joshua Hoblitt
  *
- * $Id: nebclient.h,v 1.13 2005-07-07 21:41:15 jhoblitt Exp $
+ * $Id: nebclient.h,v 1.14 2005-07-07 22:47:40 jhoblitt Exp $
  */
 
@@ -16 +16 @@
 typedef struct {
     struct soap     *soap;
-    char            *err_msg;
+    char            *err_buf;
+    size_t          err_buf_size;
 }nebServer;
 
 //void nebServerInit(nebServer *server);
 nebServer *nebServerAlloc(void);
-
-char *nebServerErr(nebServer *server);
 
 void nebServerCleanup(nebServer *server);
@@ -52 +51 @@
 int nebStat(nebServer *server, char *key);
 
-int nebErr(nebServer *server, char *errString);
+char *nebErr(nebServer *server);
 
 void nebFree(void *ptr);

trunk/Nebulous/nebclient/src/test.c

@@ -25 +25 @@
         printf( "local error\n" );
     } else {
-        printf( "server error: %s\n", nebServerErr(server) );
+        printf( "server error: %s\n", nebErr(server) );
     }