From 985d4e9b59763758f55dd762abd82ab87d2af019 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Wed, 9 Jan 2002 08:27:38 +0000 Subject: [PATCH] LCLint cleanups. svn path=/trunk/yasm/; revision=443 --- libyasm/arch.h | 2 +- libyasm/bytecode.h | 2 +- modules/arch/x86/x86-int.h | 2 +- modules/arch/x86/x86bc.c | 3 +-- src/arch.h | 2 +- src/arch/x86/x86-int.h | 2 +- src/arch/x86/x86bc.c | 3 +-- src/bytecode.h | 2 +- 8 files changed, 8 insertions(+), 10 deletions(-) diff --git a/libyasm/arch.h b/libyasm/arch.h index 408f44ea..aae614cd 100644 --- a/libyasm/arch.h +++ b/libyasm/arch.h @@ -40,7 +40,7 @@ struct arch { void (*bc_print) (FILE *f, const bytecode *bc); /* See bytecode.h comments on bc_calc_len() */ - unsigned long (*bc_calc_len) (bytecode *bc, /*@only@*/ /*@null@*/ + unsigned long (*bc_calc_len) (bytecode *bc, intnum *(*resolve_label) (symrec *sym)); } bc; }; diff --git a/libyasm/bytecode.h b/libyasm/bytecode.h index 12421142..cbe3d0d0 100644 --- a/libyasm/bytecode.h +++ b/libyasm/bytecode.h @@ -63,7 +63,7 @@ void bc_print(FILE *f, const bytecode *bc); * resolve_label is the function used to determine the value (offset) of a * in-file label (eg, not an EXTERN variable, which is indeterminate). */ -unsigned long bc_calc_len(bytecode *bc, /*@only@*/ /*@null@*/ +unsigned long bc_calc_len(bytecode *bc, intnum *(*resolve_label) (symrec *sym)); /* void bcs_initialize(bytecodehead *headp); */ diff --git a/modules/arch/x86/x86-int.h b/modules/arch/x86/x86-int.h index 262e7673..a491c312 100644 --- a/modules/arch/x86/x86-int.h +++ b/modules/arch/x86/x86-int.h @@ -96,7 +96,7 @@ typedef struct x86_jmprel { void x86_bc_delete(bytecode *bc); void x86_bc_print(FILE *f, const bytecode *bc); -unsigned long x86_bc_calc_len(bytecode *bc, /*@only@*/ /*@null@*/ +unsigned long x86_bc_calc_len(bytecode *bc, intnum *(*resolve_label) (symrec *sym)); int x86_expr_checkea(expr **ep, unsigned char *addrsize, unsigned char bits, diff --git a/modules/arch/x86/x86bc.c b/modules/arch/x86/x86bc.c index 1680bef6..46a259c7 100644 --- a/modules/arch/x86/x86bc.c +++ b/modules/arch/x86/x86bc.c @@ -464,8 +464,7 @@ x86_bc_print(FILE *f, const bytecode *bc) } static unsigned long -x86_bc_calc_len_insn(x86_insn *insn, /*@only@*/ /*@null@*/ - intnum *(*resolve_label) (symrec *sym)) +x86_bc_calc_len_insn(x86_insn *insn, intnum *(*resolve_label) (symrec *sym)) { effaddr *ea = insn->ea; x86_effaddr_data *ead = ea_get_data(ea); diff --git a/src/arch.h b/src/arch.h index 408f44ea..aae614cd 100644 --- a/src/arch.h +++ b/src/arch.h @@ -40,7 +40,7 @@ struct arch { void (*bc_print) (FILE *f, const bytecode *bc); /* See bytecode.h comments on bc_calc_len() */ - unsigned long (*bc_calc_len) (bytecode *bc, /*@only@*/ /*@null@*/ + unsigned long (*bc_calc_len) (bytecode *bc, intnum *(*resolve_label) (symrec *sym)); } bc; }; diff --git a/src/arch/x86/x86-int.h b/src/arch/x86/x86-int.h index 262e7673..a491c312 100644 --- a/src/arch/x86/x86-int.h +++ b/src/arch/x86/x86-int.h @@ -96,7 +96,7 @@ typedef struct x86_jmprel { void x86_bc_delete(bytecode *bc); void x86_bc_print(FILE *f, const bytecode *bc); -unsigned long x86_bc_calc_len(bytecode *bc, /*@only@*/ /*@null@*/ +unsigned long x86_bc_calc_len(bytecode *bc, intnum *(*resolve_label) (symrec *sym)); int x86_expr_checkea(expr **ep, unsigned char *addrsize, unsigned char bits, diff --git a/src/arch/x86/x86bc.c b/src/arch/x86/x86bc.c index 1680bef6..46a259c7 100644 --- a/src/arch/x86/x86bc.c +++ b/src/arch/x86/x86bc.c @@ -464,8 +464,7 @@ x86_bc_print(FILE *f, const bytecode *bc) } static unsigned long -x86_bc_calc_len_insn(x86_insn *insn, /*@only@*/ /*@null@*/ - intnum *(*resolve_label) (symrec *sym)) +x86_bc_calc_len_insn(x86_insn *insn, intnum *(*resolve_label) (symrec *sym)) { effaddr *ea = insn->ea; x86_effaddr_data *ead = ea_get_data(ea); diff --git a/src/bytecode.h b/src/bytecode.h index 12421142..cbe3d0d0 100644 --- a/src/bytecode.h +++ b/src/bytecode.h @@ -63,7 +63,7 @@ void bc_print(FILE *f, const bytecode *bc); * resolve_label is the function used to determine the value (offset) of a * in-file label (eg, not an EXTERN variable, which is indeterminate). */ -unsigned long bc_calc_len(bytecode *bc, /*@only@*/ /*@null@*/ +unsigned long bc_calc_len(bytecode *bc, intnum *(*resolve_label) (symrec *sym)); /* void bcs_initialize(bytecodehead *headp); */ -- 2.40.0