From 554155473b66cb184d1b4f0831d494766f4bc259 Mon Sep 17 00:00:00 2001 From: James Peach Date: Mon, 27 Feb 2006 23:45:49 +0000 Subject: [PATCH] r13733: Reorder so that locking and params declarations are not mingled. (This used to be commit cde31d5957ff9a009e111ab3719d20e70a5053b6) --- source3/include/smb.h | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/source3/include/smb.h b/source3/include/smb.h index 832f91f9bd1..352c75fd9c1 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -764,22 +764,11 @@ typedef enum { P_LOCAL,P_GLOBAL,P_SEPARATOR,P_NONE } parm_class; -/* passed to br lock code */ -enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_LOCK}; - struct enum_list { int value; const char *name; }; -#define BRLOCK_FN_CAST() \ - void (*)(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid, \ - enum brl_type lock_type, \ - br_off start, br_off size) -#define BRLOCK_FN(fn) \ - void (*fn)(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid, \ - enum brl_type lock_type, \ - br_off start, br_off size) struct parm_struct { const char *label; parm_type type; @@ -797,11 +786,6 @@ struct parm_struct { } def; }; -struct bitmap { - uint32 *b; - unsigned int n; -}; - /* The following flags are used in SWAT */ #define FLAG_BASIC 0x0001 /* Display only in BASIC view */ #define FLAG_SHARE 0x0002 /* file sharing options */ @@ -814,11 +798,28 @@ struct bitmap { #define FLAG_HIDE 0x2000 /* options that should be hidden in SWAT */ #define FLAG_DOS_STRING 0x4000 /* convert from UNIX to DOS codepage when reading this string. */ +/* passed to br lock code */ +enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_LOCK}; + +#define BRLOCK_FN_CAST() \ + void (*)(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid, \ + enum brl_type lock_type, \ + br_off start, br_off size) + +#define BRLOCK_FN(fn) \ + void (*fn)(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid, \ + enum brl_type lock_type, \ + br_off start, br_off size) + +struct bitmap { + uint32 *b; + unsigned int n; +}; + #ifndef LOCKING_VERSION #define LOCKING_VERSION 4 #endif /* LOCKING_VERSION */ - /* the basic packet size, assuming no words or bytes */ #define smb_size 39 -- 2.11.4.GIT