From 4ff626092ebbea4bceccc9f9fba0bb35b9d22808 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Wed, 15 Apr 2009 04:05:02 +0000 Subject: [PATCH] write.c (itoa): Rename back to gfc_itoa. * io/write.c (itoa) : Rename back to gfc_itoa. (write_i): Adjust call to write_decimal. (write_integer): Use gfc_itoa. From-SVN: r146079 --- libgfortran/ChangeLog | 6 ++++++ libgfortran/io/write.c | 13 +++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index b3fb58cb3384..e0b9a2c7a52b 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2009-04-15 Danny Smith + + * io/write.c (itoa) : Rename back to gfc_itoa. + (write_i): Adjust call to write_decimal. + (write_integer): Use gfc_itoa. + 2009-04-10 Janne Blomqvist * io/io.h (move_pos_offset): Remove prototype. diff --git a/libgfortran/io/write.c b/libgfortran/io/write.c index 00c7208c94c9..b6d6e687736d 100644 --- a/libgfortran/io/write.c +++ b/libgfortran/io/write.c @@ -707,10 +707,15 @@ btoa (GFC_UINTEGER_LARGEST n, char *buffer, size_t len) } -/* itoa()-- Integer to decimal conversion. */ +/* gfc_itoa()-- Integer to decimal conversion. + The itoa function is a widespread non-standard extension to standard + C, often declared in . Even though the itoa defined here + is a static function we take care not to conflict with any prior + non-static declaration. Hence the 'gfc_' prefix, which is normally + reserved for functions with external linkage. */ static const char * -itoa (GFC_INTEGER_LARGEST n, char *buffer, size_t len) +gfc_itoa (GFC_INTEGER_LARGEST n, char *buffer, size_t len) { int negative; char *p; @@ -747,7 +752,7 @@ itoa (GFC_INTEGER_LARGEST n, char *buffer, size_t len) void write_i (st_parameter_dt *dtp, const fnode *f, const char *p, int len) { - write_decimal (dtp, f, p, len, (void *) itoa); + write_decimal (dtp, f, p, len, (void *) gfc_itoa); } @@ -862,7 +867,7 @@ write_integer (st_parameter_dt *dtp, const char *source, int length) int width; char itoa_buf[GFC_ITOA_BUF_SIZE]; - q = itoa (extract_int (source, length), itoa_buf, sizeof (itoa_buf)); + q = gfc_itoa (extract_int (source, length), itoa_buf, sizeof (itoa_buf)); switch (length) { -- 2.47.3