Browse files

If something is NULLOK(const...) it is by definition ARGIN_NULLOK(con…

…st...)

git-svn-id: https://svn.parrot.org/parrot/trunk@23772 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information...
1 parent a61c479 commit 802efc13c346bb38684b268bec7e1ebf81e75f10 @petdance petdance committed Dec 12, 2007
View
2 compilers/imcc/imc.h
@@ -246,7 +246,7 @@ PARROT_CAN_RETURN_NULL
Instruction * INS(PARROT_INTERP,
NOTNULL(IMC_Unit *unit),
ARGIN(const char *name),
- NULLOK(const char *fmt),
+ ARGIN_NULLOK(const char *fmt),
NOTNULL(SymReg **r),
int n,
int keyvec,
View
4 compilers/imcc/parser_util.c
@@ -547,7 +547,7 @@ var_arg_ins(PARROT_INTERP, NOTNULL(IMC_Unit *unit), ARGIN(const char *name),
=item C<PARROT_CAN_RETURN_NULL
Instruction *
INS(PARROT_INTERP, NOTNULL(IMC_Unit *unit), ARGIN(const char *name),
- NULLOK(const char *fmt), NOTNULL(SymReg **r), int n, int keyvec, int emit)>
+ ARGIN_NULLOK(const char *fmt), NOTNULL(SymReg **r), int n, int keyvec, int emit)>
Make an instruction.
@@ -567,7 +567,7 @@ s. e.g. imc.c for usage
PARROT_CAN_RETURN_NULL
Instruction *
INS(PARROT_INTERP, NOTNULL(IMC_Unit *unit), ARGIN(const char *name),
- NULLOK(const char *fmt), NOTNULL(SymReg **r), int n, int keyvec, int emit)
+ ARGIN_NULLOK(const char *fmt), NOTNULL(SymReg **r), int n, int keyvec, int emit)
{
char fullname[64];
int i;
View
6 compilers/imcc/pbc.c
@@ -93,7 +93,7 @@ static int add_const_key(PARROT_INTERP,
__attribute__nonnull__(2);
PARROT_WARN_UNUSED_RESULT
-static int add_const_num(PARROT_INTERP, NULLOK(const char *buf))
+static int add_const_num(PARROT_INTERP, ARGIN_NULLOK(const char *buf))
__attribute__nonnull__(1);
static int add_const_pmc_sub(PARROT_INTERP,
@@ -789,7 +789,7 @@ add_const_str(PARROT_INTERP, ARGIN(const SymReg *r))
=item C<PARROT_WARN_UNUSED_RESULT
static int
-add_const_num(PARROT_INTERP, NULLOK(const char *buf))>
+add_const_num(PARROT_INTERP, ARGIN_NULLOK(const char *buf))>
RT#48260: Not yet documented!!!
@@ -799,7 +799,7 @@ RT#48260: Not yet documented!!!
PARROT_WARN_UNUSED_RESULT
static int
-add_const_num(PARROT_INTERP, NULLOK(const char *buf))
+add_const_num(PARROT_INTERP, ARGIN_NULLOK(const char *buf))
{
const int k = PDB_extend_const_table(interp);
STRING * const s = string_from_cstring(interp, buf, 0);
View
6 compilers/imcc/pcc.c
@@ -82,7 +82,7 @@ static Instruction* pcc_get_args(PARROT_INTERP,
ARGIN(const char *op_name),
int n,
NULLOK(SymReg **args),
- NULLOK(const int *arg_flags))
+ ARGIN_NULLOK(const int *arg_flags))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
__attribute__nonnull__(3);
@@ -195,7 +195,7 @@ PARROT_CAN_RETURN_NULL
static Instruction*
pcc_get_args(PARROT_INTERP, NOTNULL(IMC_Unit *unit), NOTNULL(Instruction *ins),
ARGIN(const char *op_name), int n,
- NULLOK(SymReg **args), NULLOK(const int *arg_flags))>
+ NULLOK(SymReg **args), ARGIN_NULLOK(const int *arg_flags))>
set arguments or return values
get params or results
@@ -210,7 +210,7 @@ PARROT_CAN_RETURN_NULL
static Instruction*
pcc_get_args(PARROT_INTERP, NOTNULL(IMC_Unit *unit), NOTNULL(Instruction *ins),
ARGIN(const char *op_name), int n,
- NULLOK(SymReg **args), NULLOK(const int *arg_flags))
+ NULLOK(SymReg **args), ARGIN_NULLOK(const int *arg_flags))
{
int i, flags;
char buf[1024], s[16];
View
8 compilers/imcc/symreg.c
@@ -551,7 +551,7 @@ mk_pasm_reg(PARROT_INTERP, NOTNULL(char *name))
=item C<PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
char *
-_mk_fullname(NULLOK(const Namespace *ns), ARGIN(const char *name))>
+_mk_fullname(ARGIN_NULLOK(const Namespace *ns), ARGIN(const char *name))>
RT#48260: Not yet documented!!!
@@ -562,7 +562,7 @@ RT#48260: Not yet documented!!!
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
char *
-_mk_fullname(NULLOK(const Namespace *ns), ARGIN(const char *name))
+_mk_fullname(ARGIN_NULLOK(const Namespace *ns), ARGIN(const char *name))
{
char * result;
@@ -1438,7 +1438,7 @@ get_sym(PARROT_INTERP, ARGIN(const char *name))
=item C<PARROT_CAN_RETURN_NULL
PARROT_WARN_UNUSED_RESULT
SymReg *
-_find_sym(PARROT_INTERP, NULLOK(const Namespace *nspace),
+_find_sym(PARROT_INTERP, ARGIN_NULLOK(const Namespace *nspace),
NOTNULL(SymHash *hsh), ARGIN(const char *name))>
find a symbol hash or ghash
@@ -1450,7 +1450,7 @@ find a symbol hash or ghash
PARROT_CAN_RETURN_NULL
PARROT_WARN_UNUSED_RESULT
SymReg *
-_find_sym(PARROT_INTERP, NULLOK(const Namespace *nspace),
+_find_sym(PARROT_INTERP, ARGIN_NULLOK(const Namespace *nspace),
NOTNULL(SymHash *hsh), ARGIN(const char *name))
{
const Namespace * ns;
View
6 compilers/imcc/symreg.h
@@ -120,7 +120,7 @@ struct _IMC_Unit;
PARROT_CAN_RETURN_NULL
PARROT_WARN_UNUSED_RESULT
SymReg * _find_sym(PARROT_INTERP,
- NULLOK(const Namespace *nspace),
+ ARGIN_NULLOK(const Namespace *nspace),
NOTNULL(SymHash *hsh),
ARGIN(const char *name))
__attribute__nonnull__(1)
@@ -147,7 +147,9 @@ SymReg * _mk_const(NOTNULL(SymHash *hsh), ARGIN(const char *name), int t)
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
-char * _mk_fullname(NULLOK(const Namespace *ns), ARGIN(const char *name));
+char * _mk_fullname(
+ ARGIN_NULLOK(const Namespace *ns),
+ ARGIN(const char *name));
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
View
4 include/parrot/builtin.h
@@ -40,7 +40,9 @@ void Parrot_init_builtins(PARROT_INTERP)
__attribute__nonnull__(1);
PARROT_WARN_UNUSED_RESULT
-int Parrot_is_builtin(ARGIN(const char *func), NULLOK(const char *sig));
+int Parrot_is_builtin(
+ ARGIN(const char *func),
+ ARGIN_NULLOK(const char *sig));
/* HEADERIZER END: src/builtin.c */
View
6 include/parrot/debug.h
@@ -198,7 +198,7 @@ PARROT_CAN_RETURN_NULL
PDB_condition_t * PDB_cond(PARROT_INTERP, ARGIN(const char *command))
__attribute__nonnull__(1);
-void PDB_continue(PARROT_INTERP, NULLOK(const char *command))
+void PDB_continue(PARROT_INTERP, ARGIN_NULLOK(const char *command))
__attribute__nonnull__(1);
void PDB_delete_breakpoint(PARROT_INTERP, ARGIN(const char *command))
@@ -271,7 +271,7 @@ void PDB_list(PARROT_INTERP, ARGIN(const char *command))
void PDB_load_source(PARROT_INTERP, ARGIN(const char *command))
__attribute__nonnull__(1);
-void PDB_next(PARROT_INTERP, NULLOK(const char *command))
+void PDB_next(PARROT_INTERP, ARGIN_NULLOK(const char *command))
__attribute__nonnull__(1);
void PDB_print(PARROT_INTERP, ARGIN(const char *command))
@@ -296,7 +296,7 @@ void PDB_set_break(PARROT_INTERP, ARGIN(const char *command))
void PDB_skip_breakpoint(PARROT_INTERP, long i)
__attribute__nonnull__(1);
-void PDB_trace(PARROT_INTERP, NULLOK(const char *command))
+void PDB_trace(PARROT_INTERP, ARGIN_NULLOK(const char *command))
__attribute__nonnull__(1);
int PDB_unescape(NOTNULL(char *string))
View
4 include/parrot/exceptions.h
@@ -246,8 +246,8 @@ void destroy_exception_list(PARROT_INTERP)
PARROT_DOES_NOT_RETURN
void do_panic(
NULLOK_INTERP,
- NULLOK(const char *message),
- NULLOK(const char *file),
+ ARGIN_NULLOK(const char *message),
+ ARGIN_NULLOK(const char *file),
unsigned int line);
PARROT_WARN_UNUSED_RESULT
View
13 include/parrot/extend.h
@@ -149,7 +149,7 @@ PARROT_CANNOT_RETURN_NULL
Parrot_String Parrot_new_string(PARROT_INTERP,
NULLOK(char *buffer),
int length,
- NULLOK(const char * const encoding_name),
+ ARGIN_NULLOK(const char * const encoding_name),
Parrot_Int flags)
__attribute__nonnull__(1);
@@ -256,28 +256,28 @@ void Parrot_PMC_push_numval(PARROT_INTERP,
PARROT_API
void Parrot_PMC_set_cstring(PARROT_INTERP,
Parrot_PMC pmc,
- NULLOK(const char *value))
+ ARGIN_NULLOK(const char *value))
__attribute__nonnull__(1);
PARROT_API
void Parrot_PMC_set_cstring_intkey(PARROT_INTERP,
Parrot_PMC pmc,
Parrot_Int key,
- NULLOK(const char *value))
+ ARGIN_NULLOK(const char *value))
__attribute__nonnull__(1);
PARROT_API
void Parrot_PMC_set_cstringn(PARROT_INTERP,
Parrot_PMC pmc,
- NULLOK(const char *value),
+ ARGIN_NULLOK(const char *value),
Parrot_Int length)
__attribute__nonnull__(1);
PARROT_API
void Parrot_PMC_set_cstringn_intkey(PARROT_INTERP,
Parrot_PMC pmc,
Parrot_Int key,
- NULLOK(const char *value),
+ ARGIN_NULLOK(const char *value),
Parrot_Int length)
__attribute__nonnull__(1);
@@ -345,7 +345,8 @@ void Parrot_PMC_set_vtable(SHIM_INTERP,
Parrot_VTABLE vtable);
PARROT_API
-Parrot_Int Parrot_PMC_typenum(PARROT_INTERP, NULLOK(const char *_class))
+Parrot_Int Parrot_PMC_typenum(PARROT_INTERP,
+ ARGIN_NULLOK(const char *_class))
__attribute__nonnull__(1);
PARROT_API
View
4 include/parrot/hash.h
@@ -187,7 +187,9 @@ void parrot_new_pointer_hash(SHIM_INTERP, NOTNULL(Hash **hptr))
PARROT_WARN_UNUSED_RESULT
PARROT_PURE_FUNCTION
-int int_compare(SHIM_INTERP, NULLOK(const void *a), NULLOK(const void *b));
+int int_compare(SHIM_INTERP,
+ ARGIN_NULLOK(const void *a),
+ ARGIN_NULLOK(const void *b));
PARROT_WARN_UNUSED_RESULT
PARROT_PURE_FUNCTION
View
2 include/parrot/io.h
@@ -269,7 +269,7 @@ PMC * PIO_open(PARROT_INTERP,
PARROT_API
PARROT_WARN_UNUSED_RESULT
-INTVAL PIO_parse_open_flags(NULLOK(const char *flagstr));
+INTVAL PIO_parse_open_flags(ARGIN_NULLOK(const char *flagstr));
PARROT_API
INTVAL PIO_peek(PARROT_INTERP, NOTNULL(PMC *pmc), NOTNULL(STRING **buffer))
View
2 include/parrot/key.h
@@ -68,7 +68,7 @@ PMC * key_new(PARROT_INTERP)
PARROT_API
PARROT_CANNOT_RETURN_NULL
PARROT_WARN_UNUSED_RESULT
-PMC * key_new_cstring(PARROT_INTERP, NULLOK(const char *value))
+PMC * key_new_cstring(PARROT_INTERP, ARGIN_NULLOK(const char *value))
__attribute__nonnull__(1);
PARROT_API
View
23 include/parrot/string_funcs.h
@@ -175,8 +175,8 @@ STRING * string_chr(PARROT_INTERP, UINTVAL character)
PARROT_API
PARROT_WARN_UNUSED_RESULT
INTVAL string_compare(PARROT_INTERP,
- NULLOK(const STRING *s1),
- NULLOK(const STRING *s2))
+ ARGIN_NULLOK(const STRING *s1),
+ ARGIN_NULLOK(const STRING *s2))
__attribute__nonnull__(1);
PARROT_API
@@ -227,19 +227,20 @@ void string_downcase_inplace(PARROT_INTERP, NOTNULL(STRING *s))
PARROT_API
PARROT_WARN_UNUSED_RESULT
INTVAL string_equal(PARROT_INTERP,
- NULLOK(const STRING *s1),
- NULLOK(const STRING *s2))
+ ARGIN_NULLOK(const STRING *s1),
+ ARGIN_NULLOK(const STRING *s2))
__attribute__nonnull__(1);
PARROT_API
PARROT_CAN_RETURN_NULL
-STRING * string_escape_string(PARROT_INTERP, NULLOK(const STRING *src))
+STRING * string_escape_string(PARROT_INTERP,
+ ARGIN_NULLOK(const STRING *src))
__attribute__nonnull__(1);
PARROT_API
PARROT_CAN_RETURN_NULL
STRING * string_escape_string_delimited(PARROT_INTERP,
- NULLOK(const STRING *src),
+ ARGIN_NULLOK(const STRING *src),
UINTVAL limit)
__attribute__nonnull__(1);
@@ -248,7 +249,7 @@ PARROT_WARN_UNUSED_RESULT
PARROT_MALLOC
PARROT_CANNOT_RETURN_NULL
STRING * string_from_cstring(PARROT_INTERP,
- NULLOK(const char * const buffer),
+ ARGIN_NULLOK(const char * const buffer),
const UINTVAL len)
__attribute__nonnull__(1);
@@ -306,17 +307,17 @@ PARROT_API
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
STRING * string_make(PARROT_INTERP,
- NULLOK(const char *buffer),
+ ARGIN_NULLOK(const char *buffer),
UINTVAL len,
- NULLOK(const char *charset_name),
+ ARGIN_NULLOK(const char *charset_name),
UINTVAL flags)
__attribute__nonnull__(1);
PARROT_API
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
STRING * string_make_direct(PARROT_INTERP,
- NULLOK(const char *buffer),
+ ARGIN_NULLOK(const char *buffer),
UINTVAL len,
ARGIN(const ENCODING *encoding),
ARGIN(const CHARSET *charset),
@@ -458,7 +459,7 @@ PARROT_CANNOT_RETURN_NULL
STRING * string_unescape_cstring(PARROT_INTERP,
ARGIN(const char *cstring),
char delimiter,
- NULLOK(const char *enc_char))
+ ARGIN_NULLOK(const char *enc_char))
__attribute__nonnull__(1);
PARROT_API
View
4 src/builtin.c
@@ -263,7 +263,7 @@ check_builtin_sig(size_t i, ARGIN(const char *sig), int convert_pmcs)
=item C<PARROT_WARN_UNUSED_RESULT
int
-Parrot_is_builtin(ARGIN(const char *func), NULLOK(const char *sig))>
+Parrot_is_builtin(ARGIN(const char *func), ARGIN_NULLOK(const char *sig))>
Return the index of the builtin or -1 on failure.
@@ -273,7 +273,7 @@ Return the index of the builtin or -1 on failure.
PARROT_WARN_UNUSED_RESULT
int
-Parrot_is_builtin(ARGIN(const char *func), NULLOK(const char *sig))
+Parrot_is_builtin(ARGIN(const char *func), ARGIN_NULLOK(const char *sig))
{
int bi, i, convert_pmcs;
View
18 src/debug.c
@@ -41,7 +41,7 @@ extern void imcc_init(PARROT_INTERP);
/* HEADERIZER BEGIN: static */
-static void dump_string(PARROT_INTERP, NULLOK(const STRING *s))
+static void dump_string(PARROT_INTERP, ARGIN_NULLOK(const STRING *s))
__attribute__nonnull__(1);
static int GDB_B(PARROT_INTERP, NOTNULL(char *s))
@@ -608,7 +608,7 @@ PDB_run_command(PARROT_INTERP, ARGIN(const char *command))
/*
=item C<void
-PDB_next(PARROT_INTERP, NULLOK(const char *command))>
+PDB_next(PARROT_INTERP, ARGIN_NULLOK(const char *command))>
Execute the next N operation(s).
@@ -619,7 +619,7 @@ Inits the program if needed, runs the next N >= 1 operations and stops.
*/
void
-PDB_next(PARROT_INTERP, NULLOK(const char *command))
+PDB_next(PARROT_INTERP, ARGIN_NULLOK(const char *command))
{
unsigned long n = 1;
PDB_t * const pdb = interp->pdb;
@@ -655,7 +655,7 @@ PDB_next(PARROT_INTERP, NULLOK(const char *command))
/*
=item C<void
-PDB_trace(PARROT_INTERP, NULLOK(const char *command))>
+PDB_trace(PARROT_INTERP, ARGIN_NULLOK(const char *command))>
Execute the next N operations; if no number is specified, it defaults to 1.
@@ -664,7 +664,7 @@ Execute the next N operations; if no number is specified, it defaults to 1.
*/
void
-PDB_trace(PARROT_INTERP, NULLOK(const char *command))
+PDB_trace(PARROT_INTERP, ARGIN_NULLOK(const char *command))
{
unsigned long n = 1;
PDB_t * const pdb = interp->pdb;
@@ -1061,7 +1061,7 @@ PDB_init(PARROT_INTERP, SHIM(const char *command))
/*
=item C<void
-PDB_continue(PARROT_INTERP, NULLOK(const char *command))>
+PDB_continue(PARROT_INTERP, ARGIN_NULLOK(const char *command))>
Continue running the program. If a number is specified, skip that many
breakpoints.
@@ -1071,7 +1071,7 @@ breakpoints.
*/
void
-PDB_continue(PARROT_INTERP, NULLOK(const char *command))
+PDB_continue(PARROT_INTERP, ARGIN_NULLOK(const char *command))
{
PDB_t *pdb = interp->pdb;
@@ -2317,7 +2317,7 @@ PDB_extend_const_table(PARROT_INTERP)
/*
=item C<static void
-dump_string(PARROT_INTERP, NULLOK(const STRING *s))>
+dump_string(PARROT_INTERP, ARGIN_NULLOK(const STRING *s))>
Dumps the buflen, flags, bufused, strlen, and offset associated with a string
and the string itself.
@@ -2327,7 +2327,7 @@ and the string itself.
*/
static void
-dump_string(PARROT_INTERP, NULLOK(const STRING *s))
+dump_string(PARROT_INTERP, ARGIN_NULLOK(const STRING *s))
{
if (!s)
return;
View
4 src/embed.c
@@ -344,7 +344,7 @@ Parrot_setwarnings(PARROT_INTERP, Parrot_warnclass wc)
=item C<PARROT_API
PARROT_CAN_RETURN_NULL
PackFile *
-Parrot_readbc(PARROT_INTERP, NULLOK(const char *fullname))>
+Parrot_readbc(PARROT_INTERP, ARGIN_NULLOK(const char *fullname))>
Read in a bytecode, unpack it into a C<PackFile> structure, and do fixups.
@@ -355,7 +355,7 @@ Read in a bytecode, unpack it into a C<PackFile> structure, and do fixups.
PARROT_API
PARROT_CAN_RETURN_NULL
PackFile *
-Parrot_readbc(PARROT_INTERP, NULLOK(const char *fullname))
+Parrot_readbc(PARROT_INTERP, ARGIN_NULLOK(const char *fullname))
{
INTVAL program_size, wanted;
char *program_code;
View
8 src/exceptions.c
@@ -115,8 +115,8 @@ internal_exception(int exitcode, ARGIN(const char *format), ...)
=item C<PARROT_DOES_NOT_RETURN
void
-do_panic(NULLOK_INTERP, NULLOK(const char *message),
- NULLOK(const char *file), unsigned int line)>
+do_panic(NULLOK_INTERP, ARGIN_NULLOK(const char *message),
+ ARGIN_NULLOK(const char *file), unsigned int line)>
Panic handler.
@@ -126,8 +126,8 @@ Panic handler.
PARROT_DOES_NOT_RETURN
void
-do_panic(NULLOK_INTERP, NULLOK(const char *message),
- NULLOK(const char *file), unsigned int line)
+do_panic(NULLOK_INTERP, ARGIN_NULLOK(const char *message),
+ ARGIN_NULLOK(const char *file), unsigned int line)
{
/* Note: we can't format any floats in here--Parrot_sprintf
** may panic because of floats.
View
24 src/extend.c
@@ -614,7 +614,7 @@ Parrot_PMC_set_numval_intkey(PARROT_INTERP,
=item C<PARROT_API
void
-Parrot_PMC_set_cstring(PARROT_INTERP, Parrot_PMC pmc, NULLOK(const char *value))>
+Parrot_PMC_set_cstring(PARROT_INTERP, Parrot_PMC pmc, ARGIN_NULLOK(const char *value))>
Assign the passed-in null-terminated C string to the passed-in PMC.
@@ -624,7 +624,7 @@ Assign the passed-in null-terminated C string to the passed-in PMC.
PARROT_API
void
-Parrot_PMC_set_cstring(PARROT_INTERP, Parrot_PMC pmc, NULLOK(const char *value))
+Parrot_PMC_set_cstring(PARROT_INTERP, Parrot_PMC pmc, ARGIN_NULLOK(const char *value))
{
PARROT_CALLIN_START(interp);
VTABLE_set_string_native(interp, pmc,
@@ -637,7 +637,7 @@ Parrot_PMC_set_cstring(PARROT_INTERP, Parrot_PMC pmc, NULLOK(const char *value))
=item C<PARROT_API
void
Parrot_PMC_set_cstring_intkey(PARROT_INTERP,
- Parrot_PMC pmc, Parrot_Int key, NULLOK(const char *value))>
+ Parrot_PMC pmc, Parrot_Int key, ARGIN_NULLOK(const char *value))>
Assign the passed-in null-terminated C string to the passed-in PMC.
@@ -648,7 +648,7 @@ Assign the passed-in null-terminated C string to the passed-in PMC.
PARROT_API
void
Parrot_PMC_set_cstring_intkey(PARROT_INTERP,
- Parrot_PMC pmc, Parrot_Int key, NULLOK(const char *value))
+ Parrot_PMC pmc, Parrot_Int key, ARGIN_NULLOK(const char *value))
{
PARROT_CALLIN_START(interp);
VTABLE_set_string_keyed_int(interp, pmc, key,
@@ -661,7 +661,7 @@ Parrot_PMC_set_cstring_intkey(PARROT_INTERP,
=item C<PARROT_API
void
Parrot_PMC_set_cstringn(PARROT_INTERP,
- Parrot_PMC pmc, NULLOK(const char *value), Parrot_Int length)>
+ Parrot_PMC pmc, ARGIN_NULLOK(const char *value), Parrot_Int length)>
Assign the passed-in length-noted string to the passed-in PMC.
@@ -672,7 +672,7 @@ Assign the passed-in length-noted string to the passed-in PMC.
PARROT_API
void
Parrot_PMC_set_cstringn(PARROT_INTERP,
- Parrot_PMC pmc, NULLOK(const char *value), Parrot_Int length)
+ Parrot_PMC pmc, ARGIN_NULLOK(const char *value), Parrot_Int length)
{
PARROT_CALLIN_START(interp);
VTABLE_set_string_native(interp, pmc,
@@ -750,7 +750,7 @@ Parrot_PMC_delete_pmckey(PARROT_INTERP, Parrot_PMC pmc, Parrot_PMC key)
=item C<PARROT_API
void
Parrot_PMC_set_cstringn_intkey(PARROT_INTERP,
- Parrot_PMC pmc, Parrot_Int key, NULLOK(const char *value), Parrot_Int length)>
+ Parrot_PMC pmc, Parrot_Int key, ARGIN_NULLOK(const char *value), Parrot_Int length)>
Assign the passed-in length-noted string to the passed-in PMC.
@@ -761,7 +761,7 @@ Assign the passed-in length-noted string to the passed-in PMC.
PARROT_API
void
Parrot_PMC_set_cstringn_intkey(PARROT_INTERP,
- Parrot_PMC pmc, Parrot_Int key, NULLOK(const char *value), Parrot_Int length)
+ Parrot_PMC pmc, Parrot_Int key, ARGIN_NULLOK(const char *value), Parrot_Int length)
{
PARROT_CALLIN_START(interp);
VTABLE_set_string_keyed_int(interp, pmc, key,
@@ -797,7 +797,7 @@ Parrot_PMC_new(PARROT_INTERP, Parrot_Int type)
=item C<PARROT_API
Parrot_Int
-Parrot_PMC_typenum(PARROT_INTERP, NULLOK(const char *_class))>
+Parrot_PMC_typenum(PARROT_INTERP, ARGIN_NULLOK(const char *_class))>
Returns the internal identifier that represents the named class.
@@ -807,7 +807,7 @@ Returns the internal identifier that represents the named class.
PARROT_API
Parrot_Int
-Parrot_PMC_typenum(PARROT_INTERP, NULLOK(const char *_class))
+Parrot_PMC_typenum(PARROT_INTERP, ARGIN_NULLOK(const char *_class))
{
Parrot_Int retval;
PARROT_CALLIN_START(interp);
@@ -1230,7 +1230,7 @@ PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
Parrot_String
Parrot_new_string(PARROT_INTERP, NULLOK(char *buffer), int length,
- NULLOK(const char * const encoding_name), Parrot_Int flags)>
+ ARGIN_NULLOK(const char * const encoding_name), Parrot_Int flags)>
Create a new Parrot string from a passed-in buffer. Pass in a 0 for
flags for right now.
@@ -1246,7 +1246,7 @@ PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
Parrot_String
Parrot_new_string(PARROT_INTERP, NULLOK(char *buffer), int length,
- NULLOK(const char * const encoding_name), Parrot_Int flags)
+ ARGIN_NULLOK(const char * const encoding_name), Parrot_Int flags)
{
Parrot_String retval;
PARROT_CALLIN_START(interp);
View
6 src/gc/register.c
@@ -36,7 +36,7 @@ static void clear_regs(PARROT_INTERP, NOTNULL(parrot_context_t *ctx))
static void init_context(PARROT_INTERP,
NOTNULL(parrot_context_t *ctx),
- NULLOK(const parrot_context_t *old))
+ ARGIN_NULLOK(const parrot_context_t *old))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
@@ -283,7 +283,7 @@ clear_regs(PARROT_INTERP, NOTNULL(parrot_context_t *ctx))
=item C<static void
init_context(PARROT_INTERP, NOTNULL(parrot_context_t *ctx),
- NULLOK(const parrot_context_t *old))>
+ ARGIN_NULLOK(const parrot_context_t *old))>
RT#48260: Not yet documented!!!
@@ -293,7 +293,7 @@ RT#48260: Not yet documented!!!
static void
init_context(PARROT_INTERP, NOTNULL(parrot_context_t *ctx),
- NULLOK(const parrot_context_t *old))
+ ARGIN_NULLOK(const parrot_context_t *old))
{
ctx->ref_count = 0; /* RT#46191 1 - Exceptions !!! */
ctx->current_results = NULL;
View
12 src/hash.c
@@ -92,8 +92,8 @@ static size_t key_hash_STRING(PARROT_INTERP,
PARROT_WARN_UNUSED_RESULT
PARROT_PURE_FUNCTION
static int pointer_compare(SHIM_INTERP,
- NULLOK(const void *a),
- NULLOK(const void *b));
+ ARGIN_NULLOK(const void *a),
+ ARGIN_NULLOK(const void *b));
PARROT_WARN_UNUSED_RESULT
static int STRING_compare(PARROT_INTERP,
@@ -155,7 +155,7 @@ STRING_compare(PARROT_INTERP, ARGIN(const void *search_key), ARGIN(const void *b
=item C<PARROT_WARN_UNUSED_RESULT
PARROT_PURE_FUNCTION
static int
-pointer_compare(SHIM_INTERP, NULLOK(const void *a), NULLOK(const void *b))>
+pointer_compare(SHIM_INTERP, ARGIN_NULLOK(const void *a), ARGIN_NULLOK(const void *b))>
Compares the two pointers, returning 0 if they are identical
@@ -166,7 +166,7 @@ Compares the two pointers, returning 0 if they are identical
PARROT_WARN_UNUSED_RESULT
PARROT_PURE_FUNCTION
static int
-pointer_compare(SHIM_INTERP, NULLOK(const void *a), NULLOK(const void *b))
+pointer_compare(SHIM_INTERP, ARGIN_NULLOK(const void *a), ARGIN_NULLOK(const void *b))
{
return a != b;
}
@@ -267,7 +267,7 @@ key_hash_int(SHIM_INTERP, NULLOK(void *value), size_t seed)
=item C<PARROT_WARN_UNUSED_RESULT
PARROT_PURE_FUNCTION
int
-int_compare(SHIM_INTERP, NULLOK(const void *a), NULLOK(const void *b))>
+int_compare(SHIM_INTERP, ARGIN_NULLOK(const void *a), ARGIN_NULLOK(const void *b))>
Custom C<compare> function.
@@ -278,7 +278,7 @@ Custom C<compare> function.
PARROT_WARN_UNUSED_RESULT
PARROT_PURE_FUNCTION
int
-int_compare(SHIM_INTERP, NULLOK(const void *a), NULLOK(const void *b))
+int_compare(SHIM_INTERP, ARGIN_NULLOK(const void *a), ARGIN_NULLOK(const void *b))
{
return a != b;
}
View
4 src/io/io.c
@@ -473,7 +473,7 @@ PIO_base_init(SHIM_INTERP, SHIM(ParrotIOLayer *l))
=item C<PARROT_API
PARROT_WARN_UNUSED_RESULT
INTVAL
-PIO_parse_open_flags(NULLOK(const char *flagstr))>
+PIO_parse_open_flags(ARGIN_NULLOK(const char *flagstr))>
Parses C<*flagstr> for Perl-style file open mode flags (C<< < >>, C<< > >>,
C<<< >> >>>, C<< +< >>, C<< +> >>) and returns the combined generic bit flags.
@@ -490,7 +490,7 @@ XXX BD Should this be static?
PARROT_API
PARROT_WARN_UNUSED_RESULT
INTVAL
-PIO_parse_open_flags(NULLOK(const char *flagstr))
+PIO_parse_open_flags(ARGIN_NULLOK(const char *flagstr))
{
INTVAL flags;
const char *s;
View
4 src/key.c
@@ -139,7 +139,7 @@ key_new_string(PARROT_INTERP, NOTNULL(STRING *value))
PARROT_CANNOT_RETURN_NULL
PARROT_WARN_UNUSED_RESULT
PMC *
-key_new_cstring(PARROT_INTERP, NULLOK(const char *value))>
+key_new_cstring(PARROT_INTERP, ARGIN_NULLOK(const char *value))>
Returns a new string C<Key> PMC with value C<value> converted to a
C<STRING>.
@@ -152,7 +152,7 @@ PARROT_API
PARROT_CANNOT_RETURN_NULL
PARROT_WARN_UNUSED_RESULT
PMC *
-key_new_cstring(PARROT_INTERP, NULLOK(const char *value))
+key_new_cstring(PARROT_INTERP, ARGIN_NULLOK(const char *value))
{
return key_new_string(interp,
string_from_cstring(interp, value, 0));
View
6 src/packfile.c
@@ -217,7 +217,7 @@ static void mark_1_seg(PARROT_INTERP, NOTNULL(PackFile_ConstTable *ct))
PARROT_WARN_UNUSED_RESULT
PARROT_CAN_RETURN_NULL
static PackFile * PackFile_append_pbc(PARROT_INTERP,
- NULLOK(const char *filename))
+ ARGIN_NULLOK(const char *filename))
__attribute__nonnull__(1);
static void PackFile_set_header(NOTNULL(PackFile *self))
@@ -3806,7 +3806,7 @@ PackFile_Constant_unpack_key(PARROT_INTERP, NOTNULL(PackFile_ConstTable *constt)
=item C<PARROT_WARN_UNUSED_RESULT
PARROT_CAN_RETURN_NULL
static PackFile *
-PackFile_append_pbc(PARROT_INTERP, NULLOK(const char *filename))>
+PackFile_append_pbc(PARROT_INTERP, ARGIN_NULLOK(const char *filename))>
Read a PBC and append it to the current directory
Fixup sub addresses in newly loaded bytecode and run :load subs.
@@ -3818,7 +3818,7 @@ Fixup sub addresses in newly loaded bytecode and run :load subs.
PARROT_WARN_UNUSED_RESULT
PARROT_CAN_RETURN_NULL
static PackFile *
-PackFile_append_pbc(PARROT_INTERP, NULLOK(const char *filename))
+PackFile_append_pbc(PARROT_INTERP, ARGIN_NULLOK(const char *filename))
{
PackFile * const pf = Parrot_readbc(interp, filename);
if (!pf)
View
36 src/string.c
@@ -554,7 +554,7 @@ PARROT_WARN_UNUSED_RESULT
PARROT_MALLOC
PARROT_CANNOT_RETURN_NULL
STRING *
-string_from_cstring(PARROT_INTERP, NULLOK(const char * const buffer), const UINTVAL len)>
+string_from_cstring(PARROT_INTERP, ARGIN_NULLOK(const char * const buffer), const UINTVAL len)>
Make a Parrot string from a specified C string.
@@ -567,7 +567,7 @@ PARROT_WARN_UNUSED_RESULT
PARROT_MALLOC
PARROT_CANNOT_RETURN_NULL
STRING *
-string_from_cstring(PARROT_INTERP, NULLOK(const char * const buffer), const UINTVAL len)
+string_from_cstring(PARROT_INTERP, ARGIN_NULLOK(const char * const buffer), const UINTVAL len)
{
return string_make_direct(interp, buffer, len ? len :
buffer ? strlen(buffer) : 0,
@@ -641,8 +641,8 @@ const_string(PARROT_INTERP, ARGIN(const char *buffer))
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
STRING *
-string_make(PARROT_INTERP, NULLOK(const char *buffer),
- UINTVAL len, NULLOK(const char *charset_name), UINTVAL flags)>
+string_make(PARROT_INTERP, ARGIN_NULLOK(const char *buffer),
+ UINTVAL len, ARGIN_NULLOK(const char *charset_name), UINTVAL flags)>
Creates and returns a new Parrot string using C<len> bytes of string
data read from C<buffer>.
@@ -672,8 +672,8 @@ PARROT_API
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
STRING *
-string_make(PARROT_INTERP, NULLOK(const char *buffer),
- UINTVAL len, NULLOK(const char *charset_name), UINTVAL flags)
+string_make(PARROT_INTERP, ARGIN_NULLOK(const char *buffer),
+ UINTVAL len, ARGIN_NULLOK(const char *charset_name), UINTVAL flags)
{
const ENCODING *encoding;
const CHARSET *charset;
@@ -696,7 +696,7 @@ string_make(PARROT_INTERP, NULLOK(const char *buffer),
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
STRING *
-string_make_direct(PARROT_INTERP, NULLOK(const char *buffer), UINTVAL len,
+string_make_direct(PARROT_INTERP, ARGIN_NULLOK(const char *buffer), UINTVAL len,
ARGIN(const ENCODING *encoding), ARGIN(const CHARSET *charset), UINTVAL flags)>
RT#48260: Not yet documented!!!
@@ -709,7 +709,7 @@ PARROT_API
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
STRING *
-string_make_direct(PARROT_INTERP, NULLOK(const char *buffer), UINTVAL len,
+string_make_direct(PARROT_INTERP, ARGIN_NULLOK(const char *buffer), UINTVAL len,
ARGIN(const ENCODING *encoding), ARGIN(const CHARSET *charset), UINTVAL flags)
{
STRING * const s = new_string_header(interp, flags);
@@ -1461,7 +1461,7 @@ string_chopn_inplace(PARROT_INTERP, NOTNULL(STRING *s), INTVAL n)
=item C<PARROT_API
PARROT_WARN_UNUSED_RESULT
INTVAL
-string_compare(PARROT_INTERP, NULLOK(const STRING *s1), NULLOK(const STRING *s2))>
+string_compare(PARROT_INTERP, ARGIN_NULLOK(const STRING *s1), ARGIN_NULLOK(const STRING *s2))>
RT#48260: Not yet documented!!!
@@ -1472,7 +1472,7 @@ RT#48260: Not yet documented!!!
PARROT_API
PARROT_WARN_UNUSED_RESULT
INTVAL
-string_compare(PARROT_INTERP, NULLOK(const STRING *s1), NULLOK(const STRING *s2))
+string_compare(PARROT_INTERP, ARGIN_NULLOK(const STRING *s1), ARGIN_NULLOK(const STRING *s2))
{
if (!s1 && !s2)
return 0;
@@ -1495,7 +1495,7 @@ string_compare(PARROT_INTERP, NULLOK(const STRING *s1), NULLOK(const STRING *s2)
=item C<PARROT_API
PARROT_WARN_UNUSED_RESULT
INTVAL
-string_equal(PARROT_INTERP, NULLOK(const STRING *s1), NULLOK(const STRING *s2))>
+string_equal(PARROT_INTERP, ARGIN_NULLOK(const STRING *s1), ARGIN_NULLOK(const STRING *s2))>
Compares two Parrot strings, performing type and encoding conversions if
necessary.
@@ -1510,7 +1510,7 @@ otherwise.
PARROT_API
PARROT_WARN_UNUSED_RESULT
INTVAL
-string_equal(PARROT_INTERP, NULLOK(const STRING *s1), NULLOK(const STRING *s2))
+string_equal(PARROT_INTERP, ARGIN_NULLOK(const STRING *s1), ARGIN_NULLOK(const STRING *s2))
{
if ((s1 == s2) || (!s1 && !s2)) {
return 0;
@@ -2389,7 +2389,7 @@ string_hash(PARROT_INTERP, NULLOK(STRING *s), size_t seed)
=item C<PARROT_API
PARROT_CAN_RETURN_NULL
STRING *
-string_escape_string(PARROT_INTERP, NULLOK(const STRING *src))>
+string_escape_string(PARROT_INTERP, ARGIN_NULLOK(const STRING *src))>
Escape all non-ascii chars to backslash sequences. Control chars that
C<string_unescape_cstring> can handle are esacped as I<\x>, as well
@@ -2404,7 +2404,7 @@ greater than this as I<\x{hh...hh}>.
PARROT_API
PARROT_CAN_RETURN_NULL
STRING *
-string_escape_string(PARROT_INTERP, NULLOK(const STRING *src))
+string_escape_string(PARROT_INTERP, ARGIN_NULLOK(const STRING *src))
{
return string_escape_string_delimited(interp, src, (UINTVAL) ~0);
}
@@ -2416,7 +2416,7 @@ string_escape_string(PARROT_INTERP, NULLOK(const STRING *src))
PARROT_CAN_RETURN_NULL
STRING *
string_escape_string_delimited(PARROT_INTERP,
- NULLOK(const STRING *src), UINTVAL limit)>
+ ARGIN_NULLOK(const STRING *src), UINTVAL limit)>
Like above but limit output to len chars (used for trace output of strings).
@@ -2428,7 +2428,7 @@ PARROT_API
PARROT_CAN_RETURN_NULL
STRING *
string_escape_string_delimited(PARROT_INTERP,
- NULLOK(const STRING *src), UINTVAL limit)
+ ARGIN_NULLOK(const STRING *src), UINTVAL limit)
{
STRING *result, *hex;
UINTVAL i, len, charlen;
@@ -2544,7 +2544,7 @@ string_escape_string_delimited(PARROT_INTERP,
PARROT_CANNOT_RETURN_NULL
STRING *
string_unescape_cstring(PARROT_INTERP,
- ARGIN(const char *cstring), char delimiter, NULLOK(const char *enc_char))>
+ ARGIN(const char *cstring), char delimiter, ARGIN_NULLOK(const char *enc_char))>
Unescapes the specified C string. These sequences are covered:
@@ -2564,7 +2564,7 @@ PARROT_API
PARROT_CANNOT_RETURN_NULL
STRING *
string_unescape_cstring(PARROT_INTERP,
- ARGIN(const char *cstring), char delimiter, NULLOK(const char *enc_char))
+ ARGIN(const char *cstring), char delimiter, ARGIN_NULLOK(const char *enc_char))
{
size_t clength = strlen(cstring);
STRING *result;
View
4 src/trace.c
@@ -453,7 +453,7 @@ trace_op_dump(PARROT_INTERP,
trace_op(PARROT_INTERP,
ARGIN(const opcode_t *code_start),
ARGIN(const opcode_t *code_end),
- NULLOK(const opcode_t *pc))>
+ ARGIN_NULLOK(const opcode_t *pc))>
TODO: This isn't really part of the API, but here's its documentation.
@@ -468,7 +468,7 @@ void
trace_op(PARROT_INTERP,
ARGIN(const opcode_t *code_start),
ARGIN(const opcode_t *code_end),
- NULLOK(const opcode_t *pc))
+ ARGIN_NULLOK(const opcode_t *pc))
{
if (!pc) {
return;
View
2 src/trace.h
@@ -23,7 +23,7 @@ int trace_key_dump(PARROT_INTERP, ARGIN(const PMC *key))
void trace_op(PARROT_INTERP,
ARGIN(const opcode_t *code_start),
ARGIN(const opcode_t *code_end),
- NULLOK(const opcode_t *pc))
+ ARGIN_NULLOK(const opcode_t *pc))
__attribute__nonnull__(1);
void trace_op_dump(PARROT_INTERP,

0 comments on commit 802efc1

Please sign in to comment.