diff options
| author | Volker Lendecke <vl@samba.org> | 2008-03-29 18:19:31 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-05-16 23:18:50 +0200 |
| commit | e58729f0eaefb5659396f7f0ecb6239806ee275f (patch) | |
| tree | 6e2371f524858c6afb26e2ce7174a8fc048871c3 /source3/include | |
| parent | 08971abdad82ce6b57a85ce77a8cb7906b0dab2f (diff) | |
| download | samba-e58729f0eaefb5659396f7f0ecb6239806ee275f.tar.gz samba-e58729f0eaefb5659396f7f0ecb6239806ee275f.tar.bz2 samba-e58729f0eaefb5659396f7f0ecb6239806ee275f.zip | |
Simplify fake_file logic
(This used to be commit 93111ea0a1191e8547ad6cf112e2699d3bb3799b)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/fake_file.h | 16 | ||||
| -rw-r--r-- | source3/include/ntquotas.h | 2 | ||||
| -rw-r--r-- | source3/include/smb.h | 2 |
3 files changed, 5 insertions, 15 deletions
diff --git a/source3/include/fake_file.h b/source3/include/fake_file.h index d8a53894c6..93da106030 100644 --- a/source3/include/fake_file.h +++ b/source3/include/fake_file.h @@ -31,19 +31,9 @@ we now get the unix name --metze #define FAKE_FILE_NAME_QUOTA_WIN32 "\\$Extend\\$Quota:$Q:$INDEX_ALLOCATION" #define FAKE_FILE_NAME_QUOTA_UNIX "$Extend/$Quota:$Q:$INDEX_ALLOCATION" -typedef struct _FAKE_FILE_HANDLE { +struct fake_file_handle { enum FAKE_FILE_TYPE type; - TALLOC_CTX *mem_ctx; - void *pd; /* for private data */ - void (*free_pd)(void **pd); /* free private_data */ -} FAKE_FILE_HANDLE; - -typedef struct _FAKE_FILE { - const char *name; - enum FAKE_FILE_TYPE type; - void *(*init_pd)(TALLOC_CTX *men_ctx); - void (*free_pd)(void **pd); -} FAKE_FILE; - + void *private_data; +}; #endif /* _FAKE_FILE_H */ diff --git a/source3/include/ntquotas.h b/source3/include/ntquotas.h index 8fd54e8df9..5b92b666c2 100644 --- a/source3/include/ntquotas.h +++ b/source3/include/ntquotas.h @@ -91,6 +91,6 @@ typedef struct _SMB_NTQUOTA_HANDLE { #define CHECK_NTQUOTA_HANDLE_OK(fsp,conn) (FNUM_OK(fsp,conn) &&\ (fsp)->fake_file_handle &&\ ((fsp)->fake_file_handle->type == FAKE_FILE_TYPE_QUOTA) &&\ - (fsp)->fake_file_handle->pd) + (fsp)->fake_file_handle->private_data) #endif /*_NTQUOTAS_H */ diff --git a/source3/include/smb.h b/source3/include/smb.h index 1d6aba9b69..d6b026d013 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -515,7 +515,7 @@ typedef struct files_struct { char *fsp_name; struct vfs_fsp_data *vfs_extension; - FAKE_FILE_HANDLE *fake_file_handle; + struct fake_file_handle *fake_file_handle; struct notify_change_buf *notify; |