eclient no_response calls all now have errors reported to the per-call

[disorder] / lib / eclient.c

diff --git a/lib/eclient.c b/lib/eclient.c
index 96df2c0a546fd838072cbc9300bf55bc3ab972e1..d784d413ef05f5b78313386d16b2fcc78e4ec0c1 100644 (file)
--- a/lib/eclient.c
+++ b/lib/eclient.c
@@ -884,13 +884,14 @@ static void integer_response_opcallback(disorder_eclient *c,
 /* for commands with no response */
 static void no_response_opcallback(disorder_eclient *c,
                                    struct operation *op) {
 /* for commands with no response */
 static void no_response_opcallback(disorder_eclient *c,
                                    struct operation *op) {

+  disorder_eclient_no_response *completed
+    = (disorder_eclient_no_response *)op->completed;
+

   D(("no_response_callback"));
   D(("no_response_callback"));

-  if(c->rc / 100 == 2) {
-    if(op->completed)
-      ((disorder_eclient_no_response *)op->completed)(op->v);
-  } else
-    /* TODO don't use protocol_error here */
-    protocol_error(c, op, c->rc, "%s: %s", c->ident, c->line);
+  if(c->rc / 100 == 2)
+    completed(op->v, NULL);
+  else
+    completed(op->v, errorstring(c));

 }
 
 /* error callback for queue_unmarshall */
 }
 
 /* error callback for queue_unmarshall */