diff options
| author | Jeremy Allison <jra@samba.org> | 2000-04-24 19:23:51 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-04-24 19:23:51 +0000 |
| commit | e82dbfcbe97c79b1c81915ae949bb2b1763970ba (patch) | |
| tree | 6575dd984ef9bdf74807736d48fe4eee856b96df /source3/include/smb_macros.h | |
| parent | b76e942639ab4d75bbf8103f6ea0822466b7615d (diff) | |
| download | samba-e82dbfcbe97c79b1c81915ae949bb2b1763970ba.tar.gz samba-e82dbfcbe97c79b1c81915ae949bb2b1763970ba.tar.bz2 samba-e82dbfcbe97c79b1c81915ae949bb2b1763970ba.zip | |
Now that fsp's are created on successful file open, the structure member
fsp->open is no longer needed (if an fsp pointer is valid, then it's open :-).
NB for Luke, this patch also did not apply to TNG. TNG is not yet
identical w.r.t file serving with HEAD. This makes it impossible for
me to help maintain TNG. Please fix asap.
lib/substitute.c: Removed unused variable (pidstr).
Jeremy.
(This used to be commit 389b700a26e8a308a0dff6fc038c38068aa0119a)
Diffstat (limited to 'source3/include/smb_macros.h')
| -rw-r--r-- | source3/include/smb_macros.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index cc9f158af8..e7d05189cd 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -73,7 +73,7 @@ #define SMB_ASSERT_ARRAY(a,n) SMB_ASSERT((sizeof(a)/sizeof((a)[0])) >= (n)) /* these are useful macros for checking validity of handles */ -#define OPEN_FSP(fsp) ((fsp) && (fsp)->open && !(fsp)->is_directory) +#define OPEN_FSP(fsp) ((fsp) && !(fsp)->is_directory) #define OPEN_CONN(conn) ((conn) && (conn)->open) #define IS_IPC(conn) ((conn) && (conn)->ipc) #define IS_PRINT(conn) ((conn) && (conn)->printer) @@ -150,7 +150,7 @@ #define CACHE_ERROR(w,c,e) ((w)->wr_errclass = (c), (w)->wr_error = (e), \ w->wr_discard = True, -1) /* Macro to test if an error has been cached for this fnum */ -#define HAS_CACHED_ERROR(fsp) ((fsp)->open && (fsp)->wbmpx_ptr && \ +#define HAS_CACHED_ERROR(fsp) ((fsp)->wbmpx_ptr && \ (fsp)->wbmpx_ptr->wr_discard) /* Macro to turn the cached error into an error packet */ #define CACHED_ERROR(fsp) cached_error_packet(inbuf,outbuf,fsp,__LINE__) |