From 125b1929a85d06c87fcfa6fd44d8ab973ea40083 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 7 Jun 2012 12:47:23 +0000 Subject: PR gas/14201 * sb.h (sb_max_power_two): Delete. (struct sb): Delete "item" and "pot". Make "len" a size_t. Add "max". (sb_element): Delete. (sb_add_char, sb_add_buffer, sb_skip_comma, sb_skip_write): Update prototypes. * sb.c (string_count, free_list): Delete. (sb_build, sb_kill, sb_check): Rewrite. (scrub_from_sb, sb_add_char, sb_add_string, sb_add_buffer, sb_skip_white, sb_skip_comma): Replace assorted int params, vars and return types with size_t. * input-scrub.c: Likewise. * macro.c: Likewise. * macro.h: Likewise. * as.c: Likewise. * as.h: Likewise. * input-file.h: Likewise. * input-file.c: Likewise. * read.c: Likewise. * app.c: ..or ptrdiff_t. * input-file.c (input_file_get): Use ferror. (input_file_give_next_buffer): Use input_file_get. --- gas/as.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gas/as.c') diff --git a/gas/as.c b/gas/as.c index 1ac3bdb4c3..fa4141f92b 100644 --- a/gas/as.c +++ b/gas/as.c @@ -1002,8 +1002,8 @@ close_output_file (void) /* The interface between the macro code and gas expression handling. */ -static int -macro_expr (const char *emsg, int idx, sb *in, int *val) +static size_t +macro_expr (const char *emsg, size_t idx, sb *in, offsetT *val) { char *hold; expressionS ex; @@ -1019,7 +1019,7 @@ macro_expr (const char *emsg, int idx, sb *in, int *val) if (ex.X_op != O_constant) as_bad ("%s", emsg); - *val = (int) ex.X_add_number; + *val = ex.X_add_number; return idx; } -- cgit v1.2.1