Attachment 291152 Details for Bug 428028 – fix libsmbclient api change

[patch] fix libsmbclient api change

samba-3.0.25b-api-fix.patch (text/plain), 4.01 KB, created by Simo Sorce on 2008-01-09 14:02:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simo Sorce

Created: 2008-01-09 14:02:13 UTC

Size: 4.01 KB

patch

obsolete

>diff -upr samba-3.0.25b.orig/source/include/libsmbclient.h samba-3.0.25b/source/include/libsmbclient.h
>--- samba-3.0.25b.orig/source/include/libsmbclient.h	2007-02-28 23:54:51.000000000 -0500
>+++ samba-3.0.25b/source/include/libsmbclient.h	2008-01-09 08:34:48.000000000 -0500
>@@ -428,7 +428,7 @@ struct _SMBCCTX {
> 	off_t      (*lseek)   (SMBCCTX *c, SMBCFILE * file, off_t offset, int whence);
> 	int        (*stat)    (SMBCCTX *c, const char *fname, struct stat *st);
> 	int        (*fstat)   (SMBCCTX *c, SMBCFILE *file, struct stat *st);
>-	int        (*close_fn) (SMBCCTX *c, SMBCFILE *file);
>+	int        (*close)   (SMBCCTX *c, SMBCFILE *file);
> 
> 	/** callable functions for dirs
> 	 */ 
>diff -upr samba-3.0.25b.orig/source/libsmb/libsmbclient.c samba-3.0.25b/source/libsmb/libsmbclient.c
>--- samba-3.0.25b.orig/source/libsmb/libsmbclient.c	2007-05-23 11:29:17.000000000 -0400
>+++ samba-3.0.25b/source/libsmb/libsmbclient.c	2008-01-09 08:36:51.000000000 -0500
>@@ -5980,7 +5980,7 @@ smbc_print_file_ctx(SMBCCTX *c_file,
>         if ((long)(fid2 = c_print->open_print_job(c_print, printq)) < 0) {
> 
>                 saverr = errno;  /* Save errno */
>-                c_file->close_fn(c_file, fid1);
>+                (c_file->close)(c_file, fid1);
>                 errno = saverr;
>                 return -1;
> 
>@@ -5993,8 +5993,8 @@ smbc_print_file_ctx(SMBCCTX *c_file,
>                 if ((c_print->write(c_print, fid2, buf, bytes)) < 0) {
> 
>                         saverr = errno;
>-                        c_file->close_fn(c_file, fid1);
>-                        c_print->close_fn(c_print, fid2);
>+                        (c_file->close)(c_file, fid1);
>+                        (c_print->close)(c_print, fid2);
>                         errno = saverr;
> 
>                 }
>@@ -6003,8 +6003,8 @@ smbc_print_file_ctx(SMBCCTX *c_file,
> 
>         saverr = errno;
> 
>-        c_file->close_fn(c_file, fid1);  /* We have to close these anyway */
>-        c_print->close_fn(c_print, fid2);
>+        (c_file->close)(c_file, fid1);  /* We have to close these anyway */
>+        (c_print->close)(c_print, fid2);
> 
>         if (bytes < 0) {
> 
>@@ -6198,7 +6198,7 @@ smbc_new_context(void)
>         context->creat                             = smbc_creat_ctx;
>         context->read                              = smbc_read_ctx;
>         context->write                             = smbc_write_ctx;
>-        context->close_fn                          = smbc_close_ctx;
>+        context->close                             = smbc_close_ctx;
>         context->unlink                            = smbc_unlink_ctx;
>         context->rename                            = smbc_rename_ctx;
>         context->lseek                             = smbc_lseek_ctx;
>@@ -6254,7 +6254,7 @@ smbc_free_context(SMBCCTX *context,
>                 
>                 f = context->internal->_files;
>                 while (f) {
>-                        context->close_fn(context, f);
>+                        (context->close)(context, f);
>                         f = f->next;
>                 }
>                 context->internal->_files = NULL;
>diff -upr samba-3.0.25b.orig/source/libsmb/libsmb_compat.c samba-3.0.25b/source/libsmb/libsmb_compat.c
>--- samba-3.0.25b.orig/source/libsmb/libsmb_compat.c	2006-06-23 09:16:51.000000000 -0400
>+++ samba-3.0.25b/source/libsmb/libsmb_compat.c	2008-01-09 08:35:46.000000000 -0500
>@@ -163,7 +163,7 @@ int smbc_open(const char *furl, int flag
> 
> 	fd = add_fd(file);
> 	if (fd == -1) 
>-		statcont->close_fn(statcont, file);
>+		(statcont->close)(statcont, file);
> 	return fd;
> }
> 
>@@ -180,7 +180,7 @@ int smbc_creat(const char *furl, mode_t 
> 	fd = add_fd(file);
> 	if (fd == -1) {
> 		/* Hmm... should we delete the file too ? I guess we could try */
>-		statcont->close_fn(statcont, file);
>+		(statcont->close)(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_fn(statcont, file);
>+	return (statcont->close)(statcont, file);
> }
> 
> int smbc_unlink(const char *fname)

Actions: View | Diff

Attachments on bug 428028: 291080 | 291152