diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-02 10:06:56 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-03 07:37:06 +0200 |
| commit | f13b7ec0791dc4f805a66300a540238aa57d3337 (patch) | |
| tree | 994ba84fec9a20402849f8c275b742575d00da82 /source4/cluster | |
| parent | 85eb4377dbc9e2d25e0ee2e358e785347b09f0a7 (diff) | |
| download | samba-f13b7ec0791dc4f805a66300a540238aa57d3337.tar.gz samba-f13b7ec0791dc4f805a66300a540238aa57d3337.tar.bz2 samba-f13b7ec0791dc4f805a66300a540238aa57d3337.zip | |
s4-cluster: Remove const from cluster_id_string()
This allows the caller to talloc_free() this result.
Andrew Bartlett
Diffstat (limited to 'source4/cluster')
| -rw-r--r-- | source4/cluster/cluster.c | 2 | ||||
| -rw-r--r-- | source4/cluster/cluster.h | 2 | ||||
| -rw-r--r-- | source4/cluster/cluster_private.h | 4 | ||||
| -rw-r--r-- | source4/cluster/local.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/source4/cluster/cluster.c b/source4/cluster/cluster.c index 746c004820..315145afac 100644 --- a/source4/cluster/cluster.c +++ b/source4/cluster/cluster.c @@ -60,7 +60,7 @@ struct server_id cluster_id(uint64_t id, uint32_t id2) /* return a server_id as a string */ -const char *cluster_id_string(TALLOC_CTX *mem_ctx, struct server_id id) +char *cluster_id_string(TALLOC_CTX *mem_ctx, struct server_id id) { cluster_init(); return ops->cluster_id_string(ops, mem_ctx, id); diff --git a/source4/cluster/cluster.h b/source4/cluster/cluster.h index f3b47b2838..d3ae929a5a 100644 --- a/source4/cluster/cluster.h +++ b/source4/cluster/cluster.h @@ -41,7 +41,7 @@ typedef void (*cluster_message_fn_t)(struct messaging_context *, DATA_BLOB); /* prototypes */ struct server_id cluster_id(uint64_t id, uint32_t id2); -const char *cluster_id_string(TALLOC_CTX *mem_ctx, struct server_id id); +char *cluster_id_string(TALLOC_CTX *mem_ctx, struct server_id id); struct tdb_wrap *cluster_tdb_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *dbname, int flags); void *cluster_backend_handle(void); diff --git a/source4/cluster/cluster_private.h b/source4/cluster/cluster_private.h index e57c983ed0..3207e6dafe 100644 --- a/source4/cluster/cluster_private.h +++ b/source4/cluster/cluster_private.h @@ -24,8 +24,8 @@ struct cluster_ops { struct server_id (*cluster_id)(struct cluster_ops *ops, uint64_t id, uint32_t id2); - const char *(*cluster_id_string)(struct cluster_ops *ops, - TALLOC_CTX *, struct server_id ); + char *(*cluster_id_string)(struct cluster_ops *ops, + TALLOC_CTX *, struct server_id ); struct tdb_wrap *(*cluster_tdb_tmp_open)(struct cluster_ops *, TALLOC_CTX *, struct loadparm_context *, diff --git a/source4/cluster/local.c b/source4/cluster/local.c index 0dc8b869dc..17de77f41e 100644 --- a/source4/cluster/local.c +++ b/source4/cluster/local.c @@ -44,7 +44,7 @@ static struct server_id local_id(struct cluster_ops *ops, uint64_t pid, uint32_t /* return a server_id as a string */ -static const char *local_id_string(struct cluster_ops *ops, +static char *local_id_string(struct cluster_ops *ops, TALLOC_CTX *mem_ctx, struct server_id id) { return talloc_asprintf(mem_ctx, "%u.%llu.%u", id.node, (unsigned long long)id.pid, id.id2); |