* src/vmcore/loader.h (classbuffer): Renamed class to clazz.

* src/vmcore/annotation.c,
src/vmcore/class.c,
src/vmcore/field.c,
src/vmcore/loader.c,
src/vmcore/method.c,
src/vmcore/stackmap.c,
src/vmcore/suck.c,
src/vmcore/zip.c: Likewise.

diff --git a/src/vmcore/annotation.c b/src/vmcore/annotation.c
index b71a28a27e524c36daaf4e1c062dd0844b8984f9..4d7021d4d86e670586df7b86b25096ad7e9e8c8d 100644 (file)
--- a/src/vmcore/annotation.c
+++ b/src/vmcore/annotation.c
@@ -427,7 +427,7 @@ bool annotation_load_class_attribute_runtimevisibleannotations(
                return false;
        }
 
-       LLNI_classinfo_field_set(cb->class, annotations, (java_handle_t*)annotations);
+       LLNI_classinfo_field_set(cb->clazz, annotations, (java_handle_t*)annotations);
 
        return true;
 }

diff --git a/src/vmcore/class.c b/src/vmcore/class.c
index 3137153383eb913fa3698ec1ad95b1428d9b1834..1ba1d4bcabbd47f90f544a79ed2b7305a0a90dc8 100644 (file)
--- a/src/vmcore/class.c
+++ b/src/vmcore/class.c
@@ -334,7 +334,7 @@ classinfo *class_define(utf *name, classloader *cl, int32_t length, uint8_t *dat
 
        cb = NEW(classbuffer);
 
-       cb->class = c;
+       cb->clazz = c;
        cb->size  = length;
        cb->data  = data;
        cb->pos   = cb->data;
@@ -412,7 +412,7 @@ static bool class_load_attribute_sourcefile(classbuffer *cb)
 
        /* get classinfo */
 
-       c = cb->class;
+       c = cb->clazz;
 
        /* check buffer size */
 
@@ -474,7 +474,7 @@ static bool class_load_attribute_enclosingmethod(classbuffer *cb)
 
        /* get classinfo */
 
-       c = cb->class;
+       c = cb->clazz;
 
        /* check buffer size */
 
@@ -547,7 +547,7 @@ bool class_load_attributes(classbuffer *cb)
        uint16_t               flags;
        int                    i, j;
 
-       c = cb->class;
+       c = cb->clazz;
 
        /* get attributes count */
 

diff --git a/src/vmcore/field.c b/src/vmcore/field.c
index 7f71aeccf5a0c5de320f11c11b696c3482f75eca..00c0680e9e61e29d2fec4365dad1e0f614fa1c99 100644 (file)
--- a/src/vmcore/field.c
+++ b/src/vmcore/field.c
@@ -72,7 +72,7 @@ bool field_load(classbuffer *cb, fieldinfo *f, descriptor_pool *descpool)
 
        /* Get class. */
 
-       c = cb->class;
+       c = cb->clazz;
 
        f->clazz = c;
 

diff --git a/src/vmcore/loader.c b/src/vmcore/loader.c
index 81977c7c806567343b9d81faac382f7d78451b9a..ed1c341bb1e46b0ebea100ea0b21d2becfd32eb3 100644 (file)
--- a/src/vmcore/loader.c
+++ b/src/vmcore/loader.c
@@ -545,7 +545,7 @@ static bool load_constantpool(classbuffer *cb, descriptor_pool *descpool)
        u1 *cptags;
        voidptr *cpinfos;
 
-       c = cb->class;
+       c = cb->clazz;
 
        /* number of entries in the constant_pool table plus one */
        if (!suck_check_classbuffer_size(cb, 2))
@@ -937,7 +937,7 @@ bool loader_load_attribute_signature(classbuffer *cb, utf **signature)
 
        /* get classinfo */
 
-       c = cb->class;
+       c = cb->clazz;
 
        /* check remaining bytecode */
 
@@ -1402,7 +1402,7 @@ static bool load_class_from_classbuffer_intern(classbuffer *cb)
 
        /* Get the classbuffer's class. */
 
-       c = cb->class;
+       c = cb->clazz;
 
        if (!suck_check_classbuffer_size(cb, 4 + 2 + 2))
                return false;
@@ -1952,7 +1952,7 @@ classinfo *load_class_from_classbuffer(classbuffer *cb)
 
        /* Get the classbuffer's class. */
 
-       c = cb->class;
+       c = cb->clazz;
 
        /* Check if the class is already loaded. */
 

diff --git a/src/vmcore/loader.h b/src/vmcore/loader.h
index 638a75e3b7e0d7b34ba2a7aadcf0e4e798790c5f..d67d5accdf0c9b37d54bf7ff38a98f41cb1444ae 100644 (file)
--- a/src/vmcore/loader.h
+++ b/src/vmcore/loader.h
@@ -98,7 +98,7 @@ typedef struct {            /* NameAndType (Field or Method)                  */
 /* classbuffer ****************************************************************/
 
 struct classbuffer {
-       classinfo *class;                   /* pointer to classinfo structure     */
+       classinfo *clazz;                   /* pointer to classinfo structure     */
        uint8_t   *data;                    /* pointer to byte code               */
        int32_t    size;                    /* size of the byte code              */
        uint8_t   *pos;                     /* current read position              */

diff --git a/src/vmcore/method.c b/src/vmcore/method.c
index c66cd3b9abb0e5338fa8dc6243120972daad4d2e..393ad44728396b57ca6a1053e69340eb08874ed8 100644 (file)
--- a/src/vmcore/method.c
+++ b/src/vmcore/method.c
@@ -143,7 +143,7 @@ bool method_load(classbuffer *cb, methodinfo *m, descriptor_pool *descpool)
 
        /* get classinfo */
 
-       c = cb->class;
+       c = cb->clazz;
 
        LOCK_INIT_OBJECT_LOCK(&(m->header));
 

diff --git a/src/vmcore/stackmap.c b/src/vmcore/stackmap.c
index e5b93389a4d93b9ba5eb62d1bf85d5fa47696a75..40ee97e40a91467257d2dbaa2ad95f5b34fae662 100644 (file)
--- a/src/vmcore/stackmap.c
+++ b/src/vmcore/stackmap.c
@@ -1,9 +1,7 @@
 /* src/vmcore/stackmap.c - class attribute StackMapTable
 
-   Copyright (C) 2006, 2007 R. Grafl, A. Krall, C. Kruegel, C. Oates,
-   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
-   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
-   Institut f. Computersprachen - TU Wien
+   Copyright (C) 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -411,7 +409,7 @@ bool stackmap_load_attribute_stackmaptable(classbuffer *cb, methodinfo *m)
 
        /* get classinfo */
 
-       c = cb->class;
+       c = cb->clazz;
 
        /* allocate stack map structure */
 

diff --git a/src/vmcore/suck.c b/src/vmcore/suck.c
index 8f2cbaba2220162723eac87e0a6652ab1ea48016..933ceab0074736a8990945aaebec65e7aaf63436 100644 (file)
--- a/src/vmcore/suck.c
+++ b/src/vmcore/suck.c
@@ -353,7 +353,7 @@ bool suck_check_classbuffer_size(classbuffer *cb, s4 len)
 {
 #ifdef ENABLE_VERIFIER
        if (len < 0 || ((cb->data + cb->size) - cb->pos) < len) {
-               exceptions_throw_classformaterror((cb)->class, "Truncated class file");
+               exceptions_throw_classformaterror(cb->clazz, "Truncated class file");
                return false;
        }
 #endif /* ENABLE_VERIFIER */
@@ -560,7 +560,7 @@ classbuffer *suck_start(classinfo *c)
                        if (classfile) {                                   /* file exists */
                                if (!system_stat(path, &buffer)) {     /* read classfile data */
                                        cb = NEW(classbuffer);
-                                       cb->class = c;
+                                       cb->clazz = c;
                                        cb->size  = buffer.st_size;
                                        cb->data  = MNEW(u1, cb->size);
                                        cb->pos   = cb->data;

diff --git a/src/vmcore/zip.c b/src/vmcore/zip.c
index d0a9f397c7536770ab79c46606cb20a0e4ccc6ac..c3644e22cc543e3ba6aa5e5ef0f05606437efc9a 100644 (file)
--- a/src/vmcore/zip.c
+++ b/src/vmcore/zip.c
@@ -1,9 +1,7 @@
 /* src/vmcore/zip.c - ZIP file handling for bootstrap classloader
 
-   Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -435,7 +433,7 @@ classbuffer *zip_get(list_classpath_entry *lce, classinfo *c)
 
        cb = NEW(classbuffer);
 
-       cb->class = c;
+       cb->clazz = c;
        cb->size  = htzfe->uncompressedsize;
        cb->data  = outdata;
        cb->pos   = outdata;