[PATCH] rock: remove CONTINUE_DECLS
Remove the CONTINUE_DECLS macro.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c
index 8497c6b..9f2aaa2 100644
--- a/fs/isofs/rock.c
+++ b/fs/isofs/rock.c
@@ -37,14 +37,6 @@
return 0;
}
-/* We define a series of macros because each function must do exactly the
- 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); \
@@ -98,7 +90,10 @@
{
int len;
unsigned char *chr;
- CONTINUE_DECLS;
+ int cont_extent = 0;
+ int cont_offset = 0;
+ int cont_size = 0;
+ void *buffer = NULL;
struct rock_ridge *rr;
int sig;
int retnamlen = 0;
@@ -188,8 +183,10 @@
struct inode *reloc;
struct rock_ridge *rr;
int rootflag;
-
- CONTINUE_DECLS;
+ int cont_extent = 0;
+ int cont_offset = 0;
+ int cont_size = 0;
+ void *buffer = NULL;
if (!ISOFS_SB(inode->i_sb)->s_rock)
return 0;
@@ -532,7 +529,10 @@
char *rpnt = link;
unsigned char *pnt;
struct iso_directory_record *raw_inode;
- CONTINUE_DECLS;
+ int cont_extent = 0;
+ int cont_offset = 0;
+ int cont_size = 0;
+ void *buffer = NULL;
unsigned long block, offset;
int sig;
int len;