Author: jonathan
Date: Tue Jan 6 07:06:30 2009
New Revision: 35041
Modified:
branches/bcanno/include/parrot/packfile.h
branches/bcanno/src/packfile.c
Log:
[core] Fix some seatbelts.
Modified: branches/bcanno/include/parrot/packfile.h
==============================================================================
--- branches/bcanno/include/parrot/packfile.h (original)
+++ branches/bcanno/include/parrot/packfile.h Tue Jan 6 07:06:30 2009
@@ -688,24 +688,19 @@
void PackFile_Annotations_add_entry(PARROT_INTERP,
ARGMOD(struct PackFile_Annotations *self),
- ARGIN(opcode_t offset),
- ARGIN(opcode_t key),
- ARGIN(opcode_t type),
- ARGIN(opcode_t value))
+ opcode_t offset,
+ opcode_t key,
+ opcode_t type,
+ opcode_t value)
__attribute__nonnull__(1)
__attribute__nonnull__(2)
- __attribute__nonnull__(3)
- __attribute__nonnull__(4)
- __attribute__nonnull__(5)
- __attribute__nonnull__(6)
FUNC_MODIFIES(*self);
void PackFile_Annotations_add_group(PARROT_INTERP,
ARGMOD(struct PackFile_Annotations *self),
- ARGIN(opcode_t offset))
+ opcode_t offset)
__attribute__nonnull__(1)
__attribute__nonnull__(2)
- __attribute__nonnull__(3)
FUNC_MODIFIES(*self);
void PackFile_Annotations_destroy(SHIM_INTERP,
@@ -721,20 +716,18 @@
PARROT_CANNOT_RETURN_NULL
PMC * PackFile_Annotations_lookup(PARROT_INTERP,
ARGIN(struct PackFile_Annotations *self),
- ARGIN(opcode_t offset),
+ opcode_t offset,
ARGIN_NULLOK(STRING *key))
__attribute__nonnull__(1)
- __attribute__nonnull__(2)
- __attribute__nonnull__(3);
+ __attribute__nonnull__(2);
PARROT_CANNOT_RETURN_NULL
PackFile_Segment * PackFile_Annotations_new(PARROT_INTERP,
ARGIN(struct PackFile *pf),
- ARGIN_NULLOK(const char *name),
- ARGIN(int add))
+ SHIM(const char *name),
+ NULLOK(int add))
__attribute__nonnull__(1)
- __attribute__nonnull__(2)
- __attribute__nonnull__(4);
+ __attribute__nonnull__(2);
PARROT_CANNOT_RETURN_NULL
opcode_t * PackFile_Annotations_pack(PARROT_INTERP,
@@ -879,16 +872,11 @@
#define ASSERT_ARGS_PackFile_Annotations_add_entry \
__attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(self) \
- || PARROT_ASSERT_ARG(offset) \
- || PARROT_ASSERT_ARG(key) \
- || PARROT_ASSERT_ARG(type) \
- || PARROT_ASSERT_ARG(value)
+ || PARROT_ASSERT_ARG(self)
#define ASSERT_ARGS_PackFile_Annotations_add_group \
__attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(self) \
- || PARROT_ASSERT_ARG(offset)
+ || PARROT_ASSERT_ARG(self)
#define ASSERT_ARGS_PackFile_Annotations_destroy __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(seg)
#define ASSERT_ARGS_PackFile_Annotations_dump __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
@@ -896,12 +884,10 @@
|| PARROT_ASSERT_ARG(seg)
#define ASSERT_ARGS_PackFile_Annotations_lookup __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(self) \
- || PARROT_ASSERT_ARG(offset)
+ || PARROT_ASSERT_ARG(self)
#define ASSERT_ARGS_PackFile_Annotations_new __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(pf) \
- || PARROT_ASSERT_ARG(add)
+ || PARROT_ASSERT_ARG(pf)
#define ASSERT_ARGS_PackFile_Annotations_pack __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(seg) \
Modified: branches/bcanno/src/packfile.c
==============================================================================
--- branches/bcanno/src/packfile.c (original)
+++ branches/bcanno/src/packfile.c Tue Jan 6 07:06:30 2009
@@ -231,12 +231,10 @@
PARROT_CANNOT_RETURN_NULL
static PMC * make_annotation_value_pmc(PARROT_INTERP,
ARGIN(struct PackFile_Annotations *self),
- ARGIN(INTVAL type),
- ARGIN(opcode_t value))
+ INTVAL type,
+ opcode_t value)
__attribute__nonnull__(1)
- __attribute__nonnull__(2)
- __attribute__nonnull__(3)
- __attribute__nonnull__(4);
+ __attribute__nonnull__(2);
static void make_code_pointers(ARGMOD(PackFile_Segment *seg))
__attribute__nonnull__(1)
@@ -406,9 +404,7 @@
|| PARROT_ASSERT_ARG(cursor)
#define ASSERT_ARGS_make_annotation_value_pmc __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(self) \
- || PARROT_ASSERT_ARG(type) \
- || PARROT_ASSERT_ARG(value)
+ || PARROT_ASSERT_ARG(self)
#define ASSERT_ARGS_make_code_pointers __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(seg)
#define ASSERT_ARGS_mark_1_seg __attribute__unused__ int _ASSERT_ARGS_CHECK = \
@@ -3853,7 +3849,7 @@
PARROT_CANNOT_RETURN_NULL
PackFile_Segment *
PackFile_Annotations_new(PARROT_INTERP, ARGIN(struct PackFile *pf),
- ARGIN_NULLOK(const char *name), ARGIN(int add))
+ SHIM(const char *name), SHIM(int add))
{
ASSERT_ARGS(PackFile_Annotations_new)
@@ -4119,7 +4115,7 @@
void
PackFile_Annotations_add_group(PARROT_INTERP, ARGMOD(struct
PackFile_Annotations *self),
- ARGIN(opcode_t offset))
+ opcode_t offset)
{
ASSERT_ARGS(PackFile_Annotations_add_group)
@@ -4158,7 +4154,7 @@
void
PackFile_Annotations_add_entry(PARROT_INTERP, ARGMOD(struct
PackFile_Annotations *self),
- ARGIN(opcode_t offset), ARGIN(opcode_t key), ARGIN(opcode_t type),
ARGIN(opcode_t value))
+ opcode_t offset, opcode_t key, opcode_t type, opcode_t value)
{
ASSERT_ARGS(PackFile_Annotations_add_entry)
INTVAL i;
@@ -4224,7 +4220,7 @@
PARROT_CANNOT_RETURN_NULL
static PMC *
make_annotation_value_pmc(PARROT_INTERP, ARGIN(struct PackFile_Annotations
*self),
- ARGIN(INTVAL type), ARGIN(opcode_t value))
+ INTVAL type, opcode_t value)
{
ASSERT_ARGS(make_annotation_value_pmc)
PMC *result;
@@ -4264,7 +4260,7 @@
PARROT_CANNOT_RETURN_NULL
PMC *
PackFile_Annotations_lookup(PARROT_INTERP, ARGIN(struct PackFile_Annotations
*self),
- ARGIN(opcode_t offset), ARGIN_NULLOK(STRING *key))
+ opcode_t offset, ARGIN_NULLOK(STRING *key))
{
ASSERT_ARGS(PackFile_Annotations_lookup)
INTVAL i;
