From a9ac8f511f2df778d03484a0a787f1afa8586a6b Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sat, 4 Mar 2000 01:05:48 +0000 Subject: [PATCH] Convert extract/store functions to ISO-C. --- gdb/ChangeLog | 9 +++++++++ gdb/defs.h | 6 +++--- gdb/findvar.c | 34 ++++++++-------------------------- 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5ddd6557bf..800d62205c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +Sat Mar 4 11:49:21 2000 Andrew Cagney + + * defs.h (store_address, store_unsigned_integer, store_address): + Replace PTR with void* in delcaration. + * findvar.c (extract_signed_integer, extract_unsigned_integer, + extract_long_unsigned_integer, extract_address, + store_signed_integer, store_unsigned_integer, store_address): + Convert definition to ISO-C. Replace PTR with void*. + Sat Mar 4 10:57:25 2000 Andrew Cagney * defs.h (make_cleanup_func): Document as deprecated. diff --git a/gdb/defs.h b/gdb/defs.h index 99e8d14cef..d316afce5d 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -1038,11 +1038,11 @@ extern int extract_long_unsigned_integer (void *, int, LONGEST *); extern CORE_ADDR extract_address (void *, int); -extern void store_signed_integer (PTR, int, LONGEST); +extern void store_signed_integer (void *, int, LONGEST); -extern void store_unsigned_integer (PTR, int, ULONGEST); +extern void store_unsigned_integer (void *, int, ULONGEST); -extern void store_address (PTR, int, LONGEST); +extern void store_address (void *, int, LONGEST); /* Setup definitions for host and target floating point formats. We need to consider the format for `float', `double', and `long double' for both target diff --git a/gdb/findvar.c b/gdb/findvar.c index 98322e014e..f7e01cc864 100644 --- a/gdb/findvar.c +++ b/gdb/findvar.c @@ -57,10 +57,8 @@ static int read_relative_register_raw_bytes_for_frame PARAMS ((int regnum, char you lose #endif - LONGEST -extract_signed_integer (addr, len) - PTR addr; - int len; +LONGEST +extract_signed_integer (void *addr, int len) { LONGEST retval; unsigned char *p; @@ -94,9 +92,7 @@ That operation is not available on integers of more than %d bytes.", } ULONGEST -extract_unsigned_integer (addr, len) - PTR addr; - int len; +extract_unsigned_integer (void *addr, int len) { ULONGEST retval; unsigned char *p; @@ -130,10 +126,7 @@ That operation is not available on integers of more than %d bytes.", function returns 1 and sets *PVAL. Otherwise it returns 0. */ int -extract_long_unsigned_integer (addr, orig_len, pval) - PTR addr; - int orig_len; - LONGEST *pval; +extract_long_unsigned_integer (void *addr, int orig_len, LONGEST *pval) { char *p, *first_addr; int len; @@ -177,9 +170,7 @@ extract_long_unsigned_integer (addr, orig_len, pval) } CORE_ADDR -extract_address (addr, len) - PTR addr; - int len; +extract_address (void *addr, int len) { /* Assume a CORE_ADDR can fit in a LONGEST (for now). Not sure whether we want this to be true eventually. */ @@ -187,10 +178,7 @@ extract_address (addr, len) } void -store_signed_integer (addr, len, val) - PTR addr; - int len; - LONGEST val; +store_signed_integer (void *addr, int len, LONGEST val) { unsigned char *p; unsigned char *startaddr = (unsigned char *) addr; @@ -217,10 +205,7 @@ store_signed_integer (addr, len, val) } void -store_unsigned_integer (addr, len, val) - PTR addr; - int len; - ULONGEST val; +store_unsigned_integer (void *addr, int len, ULONGEST val) { unsigned char *p; unsigned char *startaddr = (unsigned char *) addr; @@ -250,10 +235,7 @@ store_unsigned_integer (addr, len, val) gdb-local memory pointed to by "addr" for "len" bytes. */ void -store_address (addr, len, val) - PTR addr; - int len; - LONGEST val; +store_address (void *addr, int len, LONGEST val) { store_unsigned_integer (addr, len, val); }