messaging4: Simplify imessaging_path
authorVolker Lendecke <vl@samba.org>
Sun, 20 Jul 2014 14:07:44 +0000 (16:07 +0200)
committerJeremy Allison <jra@samba.org>
Mon, 28 Jul 2014 22:30:55 +0000 (00:30 +0200)
Use server_id_str_buf

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Jul 29 00:30:55 CEST 2014 on sn-devel-104

source4/lib/messaging/messaging.c

index ffa668a44581248937fa55400661ecb7e5c5421c..a67a58a6e06fc96cae2bef1331f52f8ed6e64a29 100644 (file)
@@ -136,15 +136,10 @@ static NTSTATUS irpc_uptime(struct irpc_message *msg,
 */
 static char *imessaging_path(struct imessaging_context *msg, struct server_id server_id)
 {
-       TALLOC_CTX *tmp_ctx = talloc_new(msg);
-       const char *id = server_id_str(tmp_ctx, &server_id);
-       char *s;
-       if (id == NULL) {
-               return NULL;
-       }
-       s = talloc_asprintf(msg, "%s/msg.%s", msg->base_path, id);
-       talloc_steal(s, tmp_ctx);
-       return s;
+       struct server_id_buf buf;
+
+       return talloc_asprintf(msg, "%s/msg.%s", msg->base_path,
+                              server_id_str_buf(server_id, &buf));
 }
 
 /*