diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-04-05 14:53:08 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-06 01:47:43 +0200 |
| commit | 6aa12fcb30c8f7246fd0215b1d808191c0d87668 (patch) | |
| tree | 92eb805ea2ed03b1e42f6ce55ca26a65a92761fb /source3/client | |
| parent | 48166468fe3ca515dae3431bbe674809489f743c (diff) | |
| download | samba-6aa12fcb30c8f7246fd0215b1d808191c0d87668.tar.gz samba-6aa12fcb30c8f7246fd0215b1d808191c0d87668.tar.bz2 samba-6aa12fcb30c8f7246fd0215b1d808191c0d87668.zip | |
build: Remove SMB_OFF_T, replace with off_t
Now that we always require a 64 bit off_t, we no longer need SMB_OFF_T.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Apr 6 01:47:43 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/client')
| -rw-r--r-- | source3/client/client.c | 10 | ||||
| -rw-r--r-- | source3/client/clitar.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 3bfe8e94a7..a4a7ebdeab 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -251,7 +251,7 @@ static int readfile(uint8_t *b, int n, XFILE *f) struct push_state { XFILE *f; - SMB_OFF_T nread; + off_t nread; }; static size_t push_source(uint8_t *buf, size_t n, void *priv) @@ -1070,9 +1070,9 @@ static int do_get(const char *rname, const char *lname_in, bool reget) bool newhandle = false; struct timespec tp_start; uint16 attr; - SMB_OFF_T size; + off_t size; off_t start = 0; - SMB_OFF_T nread = 0; + off_t nread = 0; int rc = 0; struct cli_state *targetcli = NULL; char *targetname = NULL; @@ -1678,7 +1678,7 @@ static int do_allinfo(const char *name) { fstring altname; struct timespec b_time, a_time, m_time, c_time; - SMB_OFF_T size; + off_t size; uint16_t mode; SMB_INO_T ino; NTTIME tmp; @@ -1838,7 +1838,7 @@ static int do_put(const char *rname, const char *lname, bool reput) TALLOC_CTX *ctx = talloc_tos(); uint16_t fnum; XFILE *f; - SMB_OFF_T start = 0; + off_t start = 0; int rc = 0; struct timespec tp_start; struct cli_state *targetcli; diff --git a/source3/client/clitar.c b/source3/client/clitar.c index 43311c13ae..b02ada427e 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -45,7 +45,7 @@ static int clipfind(char **aret, int ret, char *tok); typedef struct file_info_struct file_info2; struct file_info_struct { - SMB_OFF_T size; + off_t size; uint16 mode; uid_t uid; gid_t gid; |