Changeset 4527

Timestamp:

Jul 8, 2005, 4:06:17 PM (21 years ago)

Author:

jhoblitt

Message:

change nebSetErr() to handle filename, lineno, & function params
rename nebSetErr() -> p_nebSetErr()
add nebSetErr macro

Location:

trunk/Nebulous/nebclient/src

Files:

• nebclient.c (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.24 2005-07-09 00:31:49 jhoblitt Exp $
+ * $Id: nebclient.c,v 1.25 2005-07-09 02:06:17 jhoblitt Exp $
  */
 
@@ -25 +25 @@
 #define ERRBUF_SIZE 2048
 
-static void nebSetErr(nebServer *server, const char *format, ...);
+#define nebSetErr(server,...) \
+    p_nebSetErr(__FILE__, __LINE__, __func__, server,__VA_ARGS__)
+
+static void p_nebSetErr(const char * filename, unsigned long lineno, const char *function, nebServer *server, const char *format, ...);
 static void nebSetServerErr(nebServer *server);
 static off_t nebCopyFile(nebServer *server, const char *source, const char *dest);
@@ -407 +410 @@
 }
 
-static void nebSetErr(nebServer *server, const char *format, ...)
+
+static void p_nebSetErr(const char * filename, unsigned long lineno, const char *function, nebServer *server, const char *format, ...)
 {
     va_list         args;
     size_t          err_size;
+    char            err_location[ERRBUF_SIZE];
+    size_t          err_location_size; 
+
+    err_location_size = snprintf(err_location, ERRBUF_SIZE, "%s:%lu %s() - ",
+            filename, lineno, function);
+
+    if (err_location_size < 0) {
+        fprintf(stderr, "failed to set error info");
+
+        abort();
+    }
+
+    // copy error location info to start of error string
+    strncpy(server->err_buf, err_location, ERRBUF_SIZE);
 
     while (1) {
         va_start(args, format);
-        err_size = vsnprintf(server->err_buf, server->err_buf_size, format, args);
+        // append error string after error location info
+        err_size = vsnprintf(
+                server->err_buf + err_location_size,
+                server->err_buf_size - err_location_size,
+                format, args);
         va_end(args);
 

trunk/Nebulous/nebclient/src/test.c

@@ -70 +70 @@
 
     if (!nebDelete(server, "movedfile")) {
-        printf( "delete failed\n" );
+        printf( "delete failed %s\n", nebErr(server));
+    } else {
+        printf( "delete succeeded\n" );
+    }
+
+    if (!nebDelete(server, "movedfile")) {
+        printf( "delete failed %s\n", nebErr(server));
     } else {
         printf( "delete succeeded\n" );