svn commit: samba r3648 - in trunk/source: include smbd

[jra at samba.org]

Author: jra
Date: 2004-11-10 01:21:58 +0000 (Wed, 10 Nov 2004)
New Revision: 3648

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

Log:
Use boolean tests for flags.
Jeremy.

Modified:
   trunk/source/include/trans2.h
   trunk/source/smbd/trans2.c


Changeset:
Modified: trunk/source/include/trans2.h
===================================================================
--- trunk/source/include/trans2.h	2004-11-10 00:58:35 UTC (rev 3647)
+++ trunk/source/include/trans2.h	2004-11-10 01:21:58 UTC (rev 3648)
@@ -329,6 +329,13 @@
 #define SMB_FS_FULL_SIZE_INFORMATION			1007
 #define SMB_FS_OBJECTID_INFORMATION			1008
 
+/* flags on trans2 findfirst/findnext that control search */
+#define FLAG_TRANS2_FIND_CLOSE          0x1
+#define FLAG_TRANS2_FIND_CLOSE_IF_END   0x2
+#define FLAG_TRANS2_FIND_REQUIRE_RESUME 0x4
+#define FLAG_TRANS2_FIND_CONTINUE       0x8
+#define FLAG_TRANS2_FIND_BACKUP_INTENT  0x10
+
 /* UNIX CIFS Extensions - created by HP */
 /*
  * UNIX CIFS Extensions have the range 0x200 - 0x2FF reserved.

Modified: trunk/source/smbd/trans2.c
===================================================================
--- trunk/source/smbd/trans2.c	2004-11-10 00:58:35 UTC (rev 3647)
+++ trunk/source/smbd/trans2.c	2004-11-10 01:21:58 UTC (rev 3648)
@@ -1329,9 +1329,10 @@
 	char *pdata = *ppdata;
 	int dirtype = SVAL(params,0);
 	int maxentries = SVAL(params,2);
-	BOOL close_after_first = BITSETW(params+4,0);
-	BOOL close_if_end = BITSETW(params+4,1);
-	BOOL requires_resume_key = BITSETW(params+4,2);
+	uint16 findfirst_flags = SVAL(params,4);
+	BOOL close_after_first = (findfirst_flags & FLAG_TRANS2_FIND_CLOSE);
+	BOOL close_if_end = (findfirst_flags & FLAG_TRANS2_FIND_CLOSE_IF_END);
+	BOOL requires_resume_key = (findfirst_flags & FLAG_TRANS2_FIND_REQUIRE_RESUME);
 	int info_level = SVAL(params,6);
 	pstring directory;
 	pstring mask;
@@ -1555,10 +1556,11 @@
 	int maxentries = SVAL(params,2);
 	uint16 info_level = SVAL(params,4);
 	uint32 resume_key = IVAL(params,6);
-	BOOL close_after_request = BITSETW(params+10,0);
-	BOOL close_if_end = BITSETW(params+10,1);
-	BOOL requires_resume_key = BITSETW(params+10,2);
-	BOOL continue_bit = BITSETW(params+10,3);
+	uint16 findnext_flags = SVAL(params,10);
+	BOOL close_after_request = (findnext_flags & FLAG_TRANS2_FIND_CLOSE);
+	BOOL close_if_end = (findnext_flags & FLAG_TRANS2_FIND_CLOSE_IF_END);
+	BOOL requires_resume_key = (findnext_flags & FLAG_TRANS2_FIND_REQUIRE_RESUME);
+	BOOL continue_bit = (findnext_flags & FLAG_TRANS2_FIND_CONTINUE);
 	pstring resume_name;
 	pstring mask;
 	pstring directory;