summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-02-06 18:03:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:06:26 -0500
commit616fea56e7d12c5cfbbe2e2661a8e3d309df9410 (patch)
tree60fa398c126a901cdac858da995b757805dbf84c
parente91aca5158bad59dba8d6e06c54078116ce8f82c (diff)
downloadsamba-616fea56e7d12c5cfbbe2e2661a8e3d309df9410.tar.gz
samba-616fea56e7d12c5cfbbe2e2661a8e3d309df9410.tar.bz2
samba-616fea56e7d12c5cfbbe2e2661a8e3d309df9410.zip
r13368: I must write out 1000 times, "Don't use C++ reserved words..."
Jeremy. (This used to be commit b1ebc12b5043a7d7a85378f0d3f1d4f6cb83c411)
-rw-r--r--source3/utils/net_usershare.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/utils/net_usershare.c b/source3/utils/net_usershare.c
index c00f239b99..40f1c22688 100644
--- a/source3/utils/net_usershare.c
+++ b/source3/utils/net_usershare.c
@@ -268,13 +268,13 @@ struct priv_info {
Call a function for every share on the list.
***************************************************************************/
-static int process_share_list(int (*fn)(struct file_list *, void *), void *private)
+static int process_share_list(int (*fn)(struct file_list *, void *), void *priv)
{
struct file_list *fl;
int ret = 0;
for (fl = flist; fl; fl = fl->next) {
- ret = (*fn)(fl, private);
+ ret = (*fn)(fl, priv);
}
return ret;
@@ -284,11 +284,11 @@ static int process_share_list(int (*fn)(struct file_list *, void *), void *priva
Info function.
***************************************************************************/
-static int info_fn(struct file_list *fl, void *private)
+static int info_fn(struct file_list *fl, void *priv)
{
SMB_STRUCT_STAT sbuf;
char **lines = NULL;
- struct priv_info *pi = (struct priv_info *)private;
+ struct priv_info *pi = (struct priv_info *)priv;
TALLOC_CTX *ctx = pi->ctx;
int fd = -1;
int numlines = 0;
@@ -720,7 +720,7 @@ static int net_usershare_add(int argc, const char **argv)
List function.
***************************************************************************/
-static int list_fn(struct file_list *fl, void *private)
+static int list_fn(struct file_list *fl, void *priv)
{
d_printf("%s\n", fl->pathname);
return 0;