summaryrefslogtreecommitdiff
path: root/libgfortran/io/format.c
diff options
context:
space:
mode:
authorJanne Blomqvist <jb@gcc.gnu.org>2009-04-08 19:48:07 +0300
committerJanne Blomqvist <jb@gcc.gnu.org>2009-04-08 19:48:07 +0300
commitf9bfed2243864c72c8a7822ce0ec9b7a1f2a35c8 (patch)
treea970504f9831850f9b5d3dc40d4ebab2b7bec39a /libgfortran/io/format.c
parent75ccc1e7fa591f7a6c88ddd04b97169bcf04e5ff (diff)
downloadgcc-f9bfed2243864c72c8a7822ce0ec9b7a1f2a35c8.tar.gz
string.c (compare0): Use gfc_charlen_type.
2009-04-08 Janne Blomqvist <jb@gcc.gnu.org> * runtime/string.c (compare0): Use gfc_charlen_type. * runtime/error.c (gfc_itoa): Move to io/write.c (xtoa): Rename to gfc_xtoa. * runtime/backtrace.c (show_backtrace): Call gfc_xtoa. * intrinsics/cshift0.c (cshift0): Use index_type for shift arg. * intrinsics/date_and_time.c (date_and_time): Use index_type. (itime_i4): Likewise. (itime_i8): Likewise. (idate_i4): Likewise. (idate_i8): Likewise. (gmtime_i4): Likewise. (gmtime_i8): Likewise. (ltime_i4): Likewise. (ltime_i8): Likewise. * libgfortran.h (gfc_itoa): Remove prototype. (xtoa): Rename prototype to gfc_xtoa. * io/list_read.c (nml_read_obj): Use size_t for string length. * io/transfer.c (read_block_direct): Change nbytes arg from pointer to value. (unformatted_read): Minor cleanup, call read_block_directly properly. (skip_record): Use ssize_t. (next_record_w_unf): Avoid stell() call by calling sseek with SEEK_CUR. (iolength_transfer): Make sure to multiply before cast. * io/intrinsics.c (fgetc): Remove unnecessary variable. * io/format.c (format_hash): Use gfc_charlen_type. * io/write.c (itoa): Move from runtime/error.c:gfc_itoa, rename, make static. (write_i): Call with pointer to itoa. (write_z): Call with pointer to gfc_xtoa. (write_integer): Pointer to itoa. (nml_write_obj): Type cleanup, don't call strlen in loop. From-SVN: r145758
Diffstat (limited to 'libgfortran/io/format.c')
-rw-r--r--libgfortran/io/format.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libgfortran/io/format.c b/libgfortran/io/format.c
index 4e654aec6b5..7778311c221 100644
--- a/libgfortran/io/format.c
+++ b/libgfortran/io/format.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
+/* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
Free Software Foundation, Inc.
Contributed by Andy Vaught
F2003 I/O support contributed by Jerry DeLisle
@@ -140,9 +140,9 @@ static inline
uint32_t format_hash (st_parameter_dt *dtp)
{
char *key;
- size_t key_len;
+ gfc_charlen_type key_len;
uint32_t hash = 0;
- size_t i;
+ gfc_charlen_type i;
/* Hash the format string. Super simple, but what the heck! */
key = dtp->format;