summaryrefslogtreecommitdiff
path: root/source3/lib/util.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-04-05 14:53:08 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-04-06 01:47:43 +0200
commit6aa12fcb30c8f7246fd0215b1d808191c0d87668 (patch)
tree92eb805ea2ed03b1e42f6ce55ca26a65a92761fb /source3/lib/util.c
parent48166468fe3ca515dae3431bbe674809489f743c (diff)
downloadsamba-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/lib/util.c')
-rw-r--r--source3/lib/util.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 22fc1e7abe..e43cfbbcb8 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -320,12 +320,12 @@ char *clean_name(TALLOC_CTX *ctx, const char *s)
Write data into an fd at a given offset. Ignore seek errors.
********************************************************************/
-ssize_t write_data_at_offset(int fd, const char *buffer, size_t N, SMB_OFF_T pos)
+ssize_t write_data_at_offset(int fd, const char *buffer, size_t N, off_t pos)
{
size_t total=0;
ssize_t ret;
- if (pos == (SMB_OFF_T)-1) {
+ if (pos == (off_t)-1) {
return write_data(fd, buffer, N);
}
#if defined(HAVE_PWRITE) || defined(HAVE_PRWITE64)
@@ -1213,7 +1213,7 @@ void set_namearray(name_compare_entry **ppname_array, const char *namelist_in)
F_UNLCK in *ptype if the region is unlocked). False if the call failed.
****************************************************************************/
-bool fcntl_getlock(int fd, SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid)
+bool fcntl_getlock(int fd, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid)
{
struct flock lock;
int ret;