summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-04-29 13:30:18 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-04-29 16:38:15 +1000
commit7730ab00b5c0c8c8bf7b239c65cf769108874dae (patch)
treea1eb5acb0a71a188fd2bc667248e2d0f0b4888d5
parent93ace5cc2484b53fc33d4689ccc286defbe2b728 (diff)
downloadsamba-7730ab00b5c0c8c8bf7b239c65cf769108874dae.tar.gz
samba-7730ab00b5c0c8c8bf7b239c65cf769108874dae.tar.bz2
samba-7730ab00b5c0c8c8bf7b239c65cf769108874dae.zip
s4-param Rename volume_label() -> lpcfg_volume_label()
-rw-r--r--source4/param/loadparm.c2
-rw-r--r--source4/param/param.h2
-rw-r--r--source4/param/share_classic.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 7892e9e9b6..9083b5f59c 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -2750,7 +2750,7 @@ const char *lpcfg_servicename(const struct loadparm_service *service)
/**
* A useful volume label function.
*/
-const char *volume_label(struct loadparm_service *service, struct loadparm_service *sDefault)
+const char *lpcfg_volume_label(struct loadparm_service *service, struct loadparm_service *sDefault)
{
const char *ret;
ret = lp_string((const char *)((service != NULL && service->volume != NULL) ?
diff --git a/source4/param/param.h b/source4/param/param.h
index 084f12b723..43077f395b 100644
--- a/source4/param/param.h
+++ b/source4/param/param.h
@@ -211,7 +211,7 @@ struct loadparm_service *lpcfg_service(struct loadparm_context *lp_ctx,
/**
* A useful volume label function.
*/
-const char *volume_label(struct loadparm_service *service, struct loadparm_service *sDefault);
+const char *lp_cfg_volume_label(struct loadparm_service *service, struct loadparm_service *sDefault);
/**
* If we are PDC then prefer us as DMB
diff --git a/source4/param/share_classic.c b/source4/param/share_classic.c
index 3d5bef91e1..3442d6bd50 100644
--- a/source4/param/share_classic.c
+++ b/source4/param/share_classic.c
@@ -84,7 +84,7 @@ static const char *sclassic_string_option(struct share_config *scfg,
}
if (strcmp(opt_name, SHARE_VOLUME) == 0) {
- return volume_label(s, lpcfg_default_service(lp_ctx));
+ return lpcfg_volume_label(s, lpcfg_default_service(lp_ctx));
}
if (strcmp(opt_name, SHARE_TYPE) == 0) {