[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28a-1188-g5c83e5f

[Jeremy Allison]

The branch, v3-0-test has been updated
       via  5c83e5f9d5f672817e64c7c8c0865d3a3e2eaf14 (commit)
      from  9c5c3eadf5aaf9821c0ebe1d2bb533eff22aab63 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test


- Log -----------------------------------------------------------------
commit 5c83e5f9d5f672817e64c7c8c0865d3a3e2eaf14
Author: Jeremy Allison <jra at samba.org>
Date:   Wed May 21 13:06:46 2008 -0700

    Make 3.0.x in sync with 3.2 here.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/lib/xfile.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/xfile.c b/source/lib/xfile.c
index 9f83483..1ecaaa0 100644
--- a/source/lib/xfile.c
+++ b/source/lib/xfile.c
@@ -256,10 +256,10 @@ int x_fflush(XFILE *f)
 {
 	int ret;
 
-	if (f->bufused == 0 || !f->buf) return 0;
-
 	if (f->flags & X_FLAG_ERROR) return -1;
 
+	if (f->bufused == 0 || !f->buf) return 0;
+
 	if ((f->open_flags & O_ACCMODE) != O_WRONLY) {
 		errno = EINVAL;
 		return -1;


-- 
Samba Shared Repository