svn commit: samba r8508 - branches/SAMBA_3_0/source/include branches/SAMBA_3_0/source/smbd trunk/source/include trunk/source/smbd

[vlendec at samba.org]

Author: vlendec
Date: 2005-07-15 19:32:56 +0000 (Fri, 15 Jul 2005)
New Revision: 8508

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8508

Log:
Rename EXCLUSIVE_BREAK_SENT to BREAK_TO_NONE_SENT.

Volker

Modified:
   branches/SAMBA_3_0/source/include/smb.h
   branches/SAMBA_3_0/source/smbd/oplock.c
   trunk/source/include/smb.h
   trunk/source/smbd/oplock.c


Changeset:
Modified: branches/SAMBA_3_0/source/include/smb.h
===================================================================
--- branches/SAMBA_3_0/source/include/smb.h	2005-07-15 18:13:40 UTC (rev 8507)
+++ branches/SAMBA_3_0/source/include/smb.h	2005-07-15 19:32:56 UTC (rev 8508)
@@ -557,7 +557,7 @@
 
 /* Defines for the sent_oplock_break field above. */
 #define NO_BREAK_SENT 0
-#define EXCLUSIVE_BREAK_SENT 1
+#define BREAK_TO_NONE_SENT 1
 #define LEVEL_II_BREAK_SENT 2
 
 typedef struct {

Modified: branches/SAMBA_3_0/source/smbd/oplock.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/oplock.c	2005-07-15 18:13:40 UTC (rev 8507)
+++ branches/SAMBA_3_0/source/smbd/oplock.c	2005-07-15 19:32:56 UTC (rev 8508)
@@ -276,7 +276,7 @@
 		return False;
 	}
 
-	if (fsp->sent_oplock_break == EXCLUSIVE_BREAK_SENT || break_to_none) {
+	if (fsp->sent_oplock_break == BREAK_TO_NONE_SENT || break_to_none) {
 		/*
 		 * Deal with a reply when a break-to-none was sent.
 		 */
@@ -784,7 +784,7 @@
 
 	prepare_break_message( outbuf, fsp, using_levelII);
 	/* Remember if we just sent a break to level II on this file. */
-	fsp->sent_oplock_break = using_levelII? LEVEL_II_BREAK_SENT:EXCLUSIVE_BREAK_SENT;
+	fsp->sent_oplock_break = using_levelII? LEVEL_II_BREAK_SENT:BREAK_TO_NONE_SENT;
 
 	/* Save the server smb signing state. */
 	sign_state = srv_oplock_set_signing(False);

Modified: trunk/source/include/smb.h
===================================================================
--- trunk/source/include/smb.h	2005-07-15 18:13:40 UTC (rev 8507)
+++ trunk/source/include/smb.h	2005-07-15 19:32:56 UTC (rev 8508)
@@ -559,7 +559,7 @@
 
 /* Defines for the sent_oplock_break field above. */
 #define NO_BREAK_SENT 0
-#define EXCLUSIVE_BREAK_SENT 1
+#define BREAK_TO_NONE_SENT 1
 #define LEVEL_II_BREAK_SENT 2
 
 typedef struct {

Modified: trunk/source/smbd/oplock.c
===================================================================
--- trunk/source/smbd/oplock.c	2005-07-15 18:13:40 UTC (rev 8507)
+++ trunk/source/smbd/oplock.c	2005-07-15 19:32:56 UTC (rev 8508)
@@ -276,7 +276,7 @@
 		return False;
 	}
 
-	if (fsp->sent_oplock_break == EXCLUSIVE_BREAK_SENT || break_to_none) {
+	if (fsp->sent_oplock_break == BREAK_TO_NONE_SENT || break_to_none) {
 		/*
 		 * Deal with a reply when a break-to-none was sent.
 		 */
@@ -784,7 +784,7 @@
 
 	prepare_break_message( outbuf, fsp, using_levelII);
 	/* Remember if we just sent a break to level II on this file. */
-	fsp->sent_oplock_break = using_levelII? LEVEL_II_BREAK_SENT:EXCLUSIVE_BREAK_SENT;
+	fsp->sent_oplock_break = using_levelII? LEVEL_II_BREAK_SENT:BREAK_TO_NONE_SENT;
 
 	/* Save the server smb signing state. */
 	sign_state = srv_oplock_set_signing(False);