s4-param Rename volume_label() -> lpcfg_volume_label()

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 7892e9e9b6dcf0dbdf52bd731be1a19a95057f4e..9083b5f59c6d59bcfa1a03ba6eb1e38a090a2158 100644 (file)
--- 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 084f12b723aa775183128e459bca3ae1be1373fe..43077f395bc23d9d1c1fd1d02465e9b1729a0689 100644 (file)
--- 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 3d5bef91e1784ef572da402fed0c49435608f357..3442d6bd50dba92f325dfe6ca6441dfb79ccc86b 100644 (file)
--- 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) {