sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

lib: Use server_id_str_buf in server_id_str

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2014-06-03 13:04:56 +00:00 committed by Jeremy Allison
parent 7a3bda54b0
commit f0e1a8e1e2
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/util/server_id.c
View File

@ -65,29 +65,19 @@ char *server_id_str_buf(struct server_id id, struct server_id_buf *dst)
char *server_id_str(TALLOC_CTX *mem_ctx, const struct server_id *id)
{
if (server_id_is_disconnected(id)) {
return talloc_strdup(mem_ctx, "disconnected");
} else if (id->vnn == NONCLUSTER_VNN && id->task_id == 0) {
return talloc_asprintf(mem_ctx,
"%llu",
(unsigned long long)id->pid);
} else if (id->vnn == NONCLUSTER_VNN) {
return talloc_asprintf(mem_ctx,
"%llu.%u",
(unsigned long long)id->pid,
(unsigned)id->task_id);
} else if (id->task_id == 0) {
return talloc_asprintf(mem_ctx,
"%u:%llu",
(unsigned)id->vnn,
(unsigned long long)id->pid);
} else {
return talloc_asprintf(mem_ctx,
"%u:%llu.%u",
(unsigned)id->vnn,
(unsigned long long)id->pid,
(unsigned)id->task_id);
struct server_id_buf tmp;
char *result;
result = talloc_strdup(mem_ctx, server_id_str_buf(*id, &tmp));
if (result == NULL) {
return NULL;
}
/*
* beautify the talloc_report output
*/
talloc_set_name_const(result, result);
return result;
}
struct server_id server_id_from_string(uint32_t local_vnn,