Commit 460458ce authored Mar 31, 2011 by Jeff Layton Committed by Steve French May 19, 2011

cifs: turn BCC into a static inlined function



It's a bad idea to have macro functions that reference variables more
than once, as the arguments could have side effects. Turn BCC() into
a static inlined function instead.

While we're at it, make it return a void * to discourage anyone from
dereferencing it as-is.

Reported-and-acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Steve French <sfrench@us.ibm.com>

parent 820a803f

fs/cifs/cifspdu.h

+6 −3

Original line number	Diff line number	Diff line
		@@ -428,9 +428,12 @@ struct smb_hdr {
		__u8 WordCount;
		} __attribute__((packed));

		/* given a pointer to an smb_hdr retrieve a char pointer to the byte count */
		#define BCC(smb_var) ((unsigned char *)(smb_var) + sizeof(struct smb_hdr) + \
		(2 * (smb_var)->WordCount))
		/* given a pointer to an smb_hdr, retrieve a void pointer to the ByteCount */
		static inline void *
		BCC(struct smb_hdr *smb)
		{
		return (void )smb + sizeof(smb) + 2 * smb->WordCount;
		}

		/* given a pointer to an smb_hdr retrieve the pointer to the byte area */
		#define pByteArea(smb_var) (BCC(smb_var) + 2)

Admin message