sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-16 00:23:52 +03:00
Code Activity

r13733: Reorder so that locking and params declarations are not mingled.

Browse Source
This commit is contained in:
James Peach
2006-02-27 23:45:49 +00:00
committed by Gerald (Jerry) Carter
parent 2afcbbfb6f
commit cde31d5957
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/include/smb.h
View File

@@ -764,22 +764,11 @@ typedef enum {
P_LOCAL,P_GLOBAL,P_SEPARATOR,P_NONE P_LOCAL,P_GLOBAL,P_SEPARATOR,P_NONE
} parm_class; } parm_class;
/* passed to br lock code */
enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_LOCK};
struct enum_list { struct enum_list {
int value; int value;
const char *name; 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 { struct parm_struct {
const char *label; const char *label;
parm_type type; parm_type type;
@@ -797,11 +786,6 @@ struct parm_struct {
} def; } def;
}; };
struct bitmap {
uint32 *b;
unsigned int n;
};
/* The following flags are used in SWAT */ /* The following flags are used in SWAT */
#define FLAG_BASIC 0x0001 /* Display only in BASIC view */ #define FLAG_BASIC 0x0001 /* Display only in BASIC view */
#define FLAG_SHARE 0x0002 /* file sharing options */ #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_HIDE 0x2000 /* options that should be hidden in SWAT */
#define FLAG_DOS_STRING 0x4000 /* convert from UNIX to DOS codepage when reading this string. */ #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 #ifndef LOCKING_VERSION
#define LOCKING_VERSION 4 #define LOCKING_VERSION 4
#endif /* LOCKING_VERSION */ #endif /* LOCKING_VERSION */
/* the basic packet size, assuming no words or bytes */ /* the basic packet size, assuming no words or bytes */
#define smb_size 39 #define smb_size 39