From 14e012871f5eefd005df97b3c899f59c4e9acd32 Mon Sep 17 00:00:00 2001
From: Petr Rockai <prockai@redhat.com>
Date: Wed, 29 Jun 2011 22:20:14 +0000
Subject: [PATCH] Differentiate the request and response format, in
 daemon/common.

---
 daemons/common/daemon-client.c | 2 +-
 daemons/common/daemon-server.c | 2 +-
 daemons/common/daemon-shared.c | 4 ++--
 daemons/common/daemon-shared.h | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/daemons/common/daemon-client.c b/daemons/common/daemon-client.c
index 49d5eefd3..ea7614c94 100644
--- a/daemons/common/daemon-client.c
+++ b/daemons/common/daemon-client.c
@@ -60,7 +60,7 @@ daemon_reply daemon_send_simple(daemon_handle h, char *id, ...)
 {
 	va_list ap;
 	va_start(ap, id);
-	daemon_request rq = { .buffer = format_buffer(id, ap) };
+	daemon_request rq = { .buffer = format_buffer("request", id, ap) };
 
 	if (!rq.buffer) {
 		daemon_reply err = { .error = ENOMEM, .buffer = NULL, .cft = NULL };
diff --git a/daemons/common/daemon-server.c b/daemons/common/daemon-server.c
index 73a5c6780..27496980d 100644
--- a/daemons/common/daemon-server.c
+++ b/daemons/common/daemon-server.c
@@ -205,7 +205,7 @@ response daemon_reply_simple(char *id, ...)
 {
 	va_list ap;
 	va_start(ap, id);
-	response res = { .buffer = format_buffer(id, ap), .cft = NULL };
+	response res = { .buffer = format_buffer("response", id, ap), .cft = NULL };
 
 	if (!res.buffer)
 		res.error = ENOMEM;
diff --git a/daemons/common/daemon-shared.c b/daemons/common/daemon-shared.c
index 92e388d13..cf426d8b9 100644
--- a/daemons/common/daemon-shared.c
+++ b/daemons/common/daemon-shared.c
@@ -70,13 +70,13 @@ int write_buffer(int fd, char *buffer, int length) {
 	return 0;
 }
 
-char *format_buffer(char *id, va_list ap)
+char *format_buffer(const char *what, const char *id, va_list ap)
 {
 	char *buffer, *old;
 	char *next;
 	char *format;
 
-	dm_asprintf(&buffer, "request = \"%s\"\n", id);
+	dm_asprintf(&buffer, "%s = \"%s\"\n", what, id);
 	if (!buffer) goto fail;
 
 	while (next = va_arg(ap, char *)) {
diff --git a/daemons/common/daemon-shared.h b/daemons/common/daemon-shared.h
index 8d69ccd55..12f42fd47 100644
--- a/daemons/common/daemon-shared.h
+++ b/daemons/common/daemon-shared.h
@@ -3,4 +3,4 @@
 
 int read_buffer(int fd, char **buffer);
 int write_buffer(int fd, char *buffer, int length);
-char *format_buffer(char *id, va_list ap);
+char *format_buffer(const char *what, const char *id, va_list ap);