diff options
| author | Volker Lendecke <vlendec@samba.org> | 2005-07-03 12:05:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:58:11 -0500 |
| commit | 3a8af94424c8d60dd80f6b57806ef0b79465badc (patch) | |
| tree | 9189748ee4115aa555d339c87bf7607469ac7201 /source3/libsmb | |
| parent | d10c664b6151d3296d2fde5dc9833ea90e7ea0e8 (diff) | |
| download | samba-3a8af94424c8d60dd80f6b57806ef0b79465badc.tar.gz samba-3a8af94424c8d60dd80f6b57806ef0b79465badc.tar.bz2 samba-3a8af94424c8d60dd80f6b57806ef0b79465badc.zip | |
r8093: Next round. Now it compiles with --enable-socket-wrapper.
Volker
(This used to be commit 25cbcfba30f534f3fb31627ba43421c42ccd5b0f)
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/libsmb_compat.c | 6 | ||||
| -rw-r--r-- | source3/libsmb/libsmbclient.c | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source3/libsmb/libsmb_compat.c b/source3/libsmb/libsmb_compat.c index 3dc60f7240..f9461f9368 100644 --- a/source3/libsmb/libsmb_compat.c +++ b/source3/libsmb/libsmb_compat.c @@ -163,7 +163,7 @@ int smbc_open(const char *furl, int flags, mode_t mode) fd = add_fd(file); if (fd == -1) - statcont->close(statcont, file); + statcont->close_fn(statcont, file); return fd; } @@ -180,7 +180,7 @@ int smbc_creat(const char *furl, mode_t mode) fd = add_fd(file); if (fd == -1) { /* Hmm... should we delete the file too ? I guess we could try */ - statcont->close(statcont, file); + statcont->close_fn(statcont, file); statcont->unlink(statcont, furl); } return fd; @@ -209,7 +209,7 @@ int smbc_close(int fd) { SMBCFILE * file = find_fd(fd); del_fd(fd); - return statcont->close(statcont, file); + return statcont->close_fn(statcont, file); } int smbc_unlink(const char *fname) diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c index 1823bb2ace..9104a083f5 100644 --- a/source3/libsmb/libsmbclient.c +++ b/source3/libsmb/libsmbclient.c @@ -4953,7 +4953,7 @@ static int smbc_print_file_ctx(SMBCCTX *c_file, const char *fname, SMBCCTX *c_pr if ((int)(fid2 = c_print->open_print_job(c_print, printq)) < 0) { saverr = errno; /* Save errno */ - c_file->close(c_file, fid1); + c_file->close_fn(c_file, fid1); errno = saverr; return -1; @@ -4966,8 +4966,8 @@ static int smbc_print_file_ctx(SMBCCTX *c_file, const char *fname, SMBCCTX *c_pr if ((c_print->write(c_print, fid2, buf, bytes)) < 0) { saverr = errno; - c_file->close(c_file, fid1); - c_print->close(c_print, fid2); + c_file->close_fn(c_file, fid1); + c_print->close_fn(c_print, fid2); errno = saverr; } @@ -4976,8 +4976,8 @@ static int smbc_print_file_ctx(SMBCCTX *c_file, const char *fname, SMBCCTX *c_pr saverr = errno; - c_file->close(c_file, fid1); /* We have to close these anyway */ - c_print->close(c_print, fid2); + c_file->close_fn(c_file, fid1); /* We have to close these anyway */ + c_print->close_fn(c_print, fid2); if (bytes < 0) { @@ -5152,7 +5152,7 @@ SMBCCTX * smbc_new_context(void) context->creat = smbc_creat_ctx; context->read = smbc_read_ctx; context->write = smbc_write_ctx; - context->close = smbc_close_ctx; + context->close_fn = smbc_close_ctx; context->unlink = smbc_unlink_ctx; context->rename = smbc_rename_ctx; context->lseek = smbc_lseek_ctx; @@ -5206,7 +5206,7 @@ int smbc_free_context(SMBCCTX * context, int shutdown_ctx) f = context->internal->_files; while (f) { - context->close(context, f); + context->close_fn(context, f); f = f->next; } context->internal->_files = NULL; |