[PATCH 2/9] isofs: inline macros in rock.c

[Pekka Enberg]

This patch inlines the CONTINUE_DECLS macro in fs/isofs/rock.c.

Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
---

 rock.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

Index: 2.6/fs/isofs/rock.c
===================================================================
--- 2.6.orig/fs/isofs/rock.c	2005-03-28 16:27:39.000000000 +0300
+++ 2.6/fs/isofs/rock.c	2005-03-28 16:27:40.000000000 +0300
@@ -38,10 +38,6 @@
    same thing in certain places.  We use the macros to ensure that everything
    is done correctly */
 
-#define CONTINUE_DECLS \
-  int cont_extent = 0, cont_offset = 0, cont_size = 0;   \
-  void *buffer = NULL
-
 #define CHECK_CE	       			\
       {cont_extent = isonum_733(rr->u.CE.extent); \
       cont_offset = isonum_733(rr->u.CE.offset); \
@@ -95,7 +91,8 @@
 {
 	int len;
 	unsigned char *chr;
-	CONTINUE_DECLS;
+	int cont_extent = 0, cont_offset = 0, cont_size = 0;
+	void *buffer = NULL;
 	int retnamlen = 0, truncate = 0;
 
 	if (!ISOFS_SB(inode->i_sb)->s_rock)
@@ -184,7 +181,8 @@
 	int len;
 	unsigned char *chr;
 	int symlink_len = 0;
-	CONTINUE_DECLS;
+	int cont_extent = 0, cont_offset = 0, cont_size = 0;
+	void *buffer = NULL;
 
 	if (!ISOFS_SB(inode->i_sb)->s_rock)
 		return 0;
@@ -527,7 +525,8 @@
 	char *rpnt = link;
 	unsigned char *pnt;
 	struct iso_directory_record *raw_inode;
-	CONTINUE_DECLS;
+	int cont_extent = 0, cont_offset = 0, cont_size = 0;
+	void *buffer = NULL;
 	unsigned long block, offset;
 	int sig;
 	int len;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/