[svn:parrot] r35042 - in branches/bcanno: include/parrot src src/atomic

[jonathan]

Author: jonathan
Date: Tue Jan  6 07:24:02 2009
New Revision: 35042

Modified:
   branches/bcanno/include/parrot/packfile.h
   branches/bcanno/src/atomic/gcc_x86.c
   branches/bcanno/src/packfile.c

Log:
[core] Clean up warnings from annotations code.

Modified: branches/bcanno/include/parrot/packfile.h
==============================================================================
--- branches/bcanno/include/parrot/packfile.h   (original)
+++ branches/bcanno/include/parrot/packfile.h   Tue Jan  6 07:24:02 2009
@@ -746,12 +746,11 @@
 PARROT_CANNOT_RETURN_NULL
 opcode_t * PackFile_Annotations_unpack(PARROT_INTERP,
     ARGMOD(PackFile_Segment *seg),
-    ARGMOD(opcode_t *cursor))
+    ARGIN(const opcode_t *cursor))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3)
-        FUNC_MODIFIES(*seg)
-        FUNC_MODIFIES(*cursor);
+        FUNC_MODIFIES(*seg);
 
 #define ASSERT_ARGS_do_sub_pragmas __attribute__unused__ int 
_ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \

Modified: branches/bcanno/src/atomic/gcc_x86.c
==============================================================================
--- branches/bcanno/src/atomic/gcc_x86.c        (original)
+++ branches/bcanno/src/atomic/gcc_x86.c        Tue Jan  6 07:24:02 2009
@@ -34,7 +34,7 @@
  */
 /*
 
-=item C<void * parrot_i386_cmpxchg (ptr, expect, update)>
+=item C<void * parrot_i386_cmpxchg>
 
 The CMPXCHG assembly instruction is a single cycle x86 instruction
 that compares C<expect> and C<*ptr>. If they are equal, sets

Modified: branches/bcanno/src/packfile.c
==============================================================================
--- branches/bcanno/src/packfile.c      (original)
+++ branches/bcanno/src/packfile.c      Tue Jan  6 07:24:02 2009
@@ -3981,7 +3981,7 @@
 PARROT_CANNOT_RETURN_NULL
 opcode_t *
 PackFile_Annotations_unpack(PARROT_INTERP, ARGMOD(PackFile_Segment *seg),
-        ARGMOD(opcode_t *cursor))
+        ARGIN(const opcode_t *cursor))
 {
     ASSERT_ARGS(PackFile_Annotations_unpack)
     PackFile_Annotations *self = (PackFile_Annotations *)seg;
@@ -4121,7 +4121,7 @@
 
     /* Allocate extra space for the group in the groups array. */
     if (self->groups)
-        self->groups = mem_sys_realloc(self->groups, (1 + self->num_groups) *
+        self->groups = (PackFile_Annotations_Group 
**)mem_sys_realloc(self->groups, (1 + self->num_groups) *
                 sizeof(PackFile_Annotations_Group *));
     else
         self->groups = mem_allocate_n_typed(self->num_groups + 1, 
PackFile_Annotations_Group *);
@@ -4172,7 +4172,7 @@
     if (key_id == -1) {
         /* We do nee have it. Add key entry. */
         if (self->keys)
-            self->keys = mem_sys_realloc(self->keys, (1 + self->num_keys) *
+            self->keys = (PackFile_Annotations_Key 
**)mem_sys_realloc(self->keys, (1 + self->num_keys) *
                     sizeof(PackFile_Annotations_Key *));
         else
             self->keys = mem_allocate_n_typed(self->num_keys + 1, 
PackFile_Annotations_Key *);
@@ -4194,7 +4194,7 @@
 
     /* Add annotations entry. */
     if (self->entries)
-            self->entries = mem_sys_realloc(self->entries, (1 + 
self->num_entries) *
+            self->entries = (PackFile_Annotations_Entry 
**)mem_sys_realloc(self->entries, (1 + self->num_entries) *
                     sizeof(PackFile_Annotations_Entry *));
         else
             self->entries = mem_allocate_n_typed(self->num_entries + 1, 
PackFile_Annotations_Entry *);