diff options
| author | Christian Ambach <ambi@samba.org> | 2016-02-08 23:24:36 +0100 |
|---|---|---|
| committer | Christian Ambach <ambi@samba.org> | 2016-02-26 11:31:32 +0100 |
| commit | c91dde9caec39ac76d50602f8b32b6917dfeefba (patch) | |
| tree | 212c93de9b042d302e4e8e4ec4c585de915cba5b /source3/utils/smbget.c | |
| parent | 0c74d62524db376b6a3fac00c688be0cdffcaa80 (diff) | |
| download | samba-c91dde9caec39ac76d50602f8b32b6917dfeefba.tar.gz | |
s3:utils/smbget another int -> bool conversion
Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3/utils/smbget.c')
| -rw-r--r-- | source3/utils/smbget.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c index 91809d1d245..24f26b07c45 100644 --- a/source3/utils/smbget.c +++ b/source3/utils/smbget.c @@ -163,9 +163,7 @@ static void get_auth_data(const char *srv, const char *shr, char *wg, int wglen, } } -/* Return 1 on error, 0 on success. */ - -static int smb_download_dir(const char *base, const char *name, int resume) +static bool smb_download_dir(const char *base, const char *name, int resume) { char path[SMB_MAXPATHLEN]; int dirhandle; @@ -173,7 +171,7 @@ static int smb_download_dir(const char *base, const char *name, int resume) const char *relname = name; char *tmpname; struct stat remotestat; - int ret = 0; + bool ok = false; snprintf(path, SMB_MAXPATHLEN-1, "%s%s%s", base, (base[0] && name[0] && name[0] != '/' && @@ -189,7 +187,7 @@ static int smb_download_dir(const char *base, const char *name, int resume) } fprintf(stderr, "Can't open directory %s: %s\n", path, strerror(errno)); - return 1; + return false; } while (*relname == '/') { @@ -206,28 +204,28 @@ static int smb_download_dir(const char *base, const char *name, int resume) } if (asprintf(&newname, "%s/%s", tmpname, dirent->name) == -1) { free(tmpname); - return 1; + return false; } switch (dirent->smbc_type) { case SMBC_DIR: - ret = smb_download_dir(base, newname, resume); + ok = smb_download_dir(base, newname, resume); break; case SMBC_WORKGROUP: - ret = smb_download_dir("smb://", dirent->name, resume); + ok = smb_download_dir("smb://", dirent->name, resume); break; case SMBC_SERVER: - ret = smb_download_dir("smb://", dirent->name, resume); + ok = smb_download_dir("smb://", dirent->name, resume); break; case SMBC_FILE: - ret = smb_download_file(base, newname, true, resume, + ok = smb_download_file(base, newname, true, resume, false, NULL); break; case SMBC_FILE_SHARE: - ret = smb_download_dir(base, newname, resume); + ok = smb_download_dir(base, newname, resume); break; case SMBC_PRINTER_SHARE: @@ -266,7 +264,7 @@ static int smb_download_dir(const char *base, const char *name, int resume) "Unable to get stats on %s on remote server\n", path); smbc_closedir(dirhandle); - return 1; + return false; } if (chmod(relname, remotestat.st_mode) < 0) { @@ -274,12 +272,12 @@ static int smb_download_dir(const char *base, const char *name, int resume) "Unable to change mode of local dir %s to %o\n", relname, (unsigned int)remotestat.st_mode); smbc_closedir(dirhandle); - return 1; + return false; } } smbc_closedir(dirhandle); - return ret; + return ok; } static char *print_time(long t) |