diff options
| author | Volker Lendecke <vl@samba.org> | 2008-12-13 17:04:12 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-12-13 19:19:46 +0100 |
| commit | da6be4102ed1e3d4e20f08dd8944f062d13c759a (patch) | |
| tree | 8937077ca5dc92926151663d24b414463a7c8838 | |
| parent | b04d00744efb2189c37c01b2c57cc3899db1e482 (diff) | |
| download | samba-da6be4102ed1e3d4e20f08dd8944f062d13c759a.tar.gz samba-da6be4102ed1e3d4e20f08dd8944f062d13c759a.tar.bz2 samba-da6be4102ed1e3d4e20f08dd8944f062d13c759a.zip | |
Remove a static variable
Derrell, please check!
Thanks,
Volker
| -rw-r--r-- | source3/libsmb/libsmb_dir.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c index aa313f2c05..d12e7487f6 100644 --- a/source3/libsmb/libsmb_dir.c +++ b/source3/libsmb/libsmb_dir.c @@ -1193,8 +1193,6 @@ SMBC_mkdir_ctx(SMBCCTX *context, * Our list function simply checks to see if a directory is not empty */ -static int smbc_rmdir_dirempty = True; - static void rmdir_list_fn(const char *mnt, file_info *finfo, @@ -1203,7 +1201,8 @@ rmdir_list_fn(const char *mnt, { if (strncmp(finfo->name, ".", 1) != 0 && strncmp(finfo->name, "..", 2) != 0) { - smbc_rmdir_dirempty = False; + bool *smbc_rmdir_dirempty = (bool *)state; + *smbc_rmdir_dirempty = false; } } @@ -1292,8 +1291,7 @@ SMBC_rmdir_ctx(SMBCCTX *context, /* Local storage to avoid buffer overflows */ char *lpath; - - smbc_rmdir_dirempty = True; /* Make this so ... */ + bool smbc_rmdir_dirempty = true; lpath = talloc_asprintf(frame, "%s\\*", targetpath); @@ -1305,7 +1303,8 @@ SMBC_rmdir_ctx(SMBCCTX *context, if (cli_list(targetcli, lpath, aDIR | aSYSTEM | aHIDDEN, - rmdir_list_fn, NULL) < 0) { + rmdir_list_fn, + &smbc_rmdir_dirempty) < 0) { /* Fix errno to ignore latest error ... */ DEBUG(5, ("smbc_rmdir: " |