diff options
| author | Andreas Jaeger <aj@suse.de> | 2005-05-15 17:33:12 +0200 |
|---|---|---|
| committer | Andreas Jaeger <aj@gcc.gnu.org> | 2005-05-15 17:33:12 +0200 |
| commit | 6b0215364d3709b555115d4a1bdcdea70350dbc0 (patch) | |
| tree | 4fbbf0748f7bb16952937461e107a70dba0a10c3 /libgfortran | |
| parent | 944e86ee0993cc5e4f9fc06be22a8a88300698d1 (diff) | |
| download | gcc-6b0215364d3709b555115d4a1bdcdea70350dbc0.tar.gz | |
system_clock.c (system_clock_4, [...]): Add missing returns, reformat a bit.
* intrinsics/system_clock.c (system_clock_4, system_clock_8): Add
missing returns, reformat a bit.
* io/write.c (nml_write_obj): Use %d again - and cast to int,
st_sprintf does not handle %ld.
From-SVN: r99722
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
| -rw-r--r-- | libgfortran/intrinsics/system_clock.c | 36 | ||||
| -rw-r--r-- | libgfortran/io/write.c | 2 |
3 files changed, 31 insertions, 13 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 38be6a37fb1..cfb62a32ad1 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,5 +1,11 @@ 2005-05-15 Andreas Jaeger <aj@suse.de> + * intrinsics/system_clock.c (system_clock_4, system_clock_8): Add + missing returns, reformat a bit. + + * io/write.c (nml_write_obj): Use %d again - and cast to int, + st_sprintf does not handle %ld. + * io/unit.c (is_internal_unit): Add void as parameter list. * io/transfer.c: Move prototype declarations before the functions. diff --git a/libgfortran/intrinsics/system_clock.c b/libgfortran/intrinsics/system_clock.c index 1d6455831cf..17c7bb62097 100644 --- a/libgfortran/intrinsics/system_clock.c +++ b/libgfortran/intrinsics/system_clock.c @@ -1,5 +1,5 @@ /* Implementation of the SYSTEM_CLOCK intrinsic. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU Fortran 95 runtime library (libgfortran). @@ -104,9 +104,13 @@ system_clock_4(GFC_INTEGER_4 *count, GFC_INTEGER_4 *count_rate, } else { - if (count != NULL) *count = - GFC_INTEGER_4_HUGE; - if (count_rate != NULL) *count_rate = 0; - if (count_max != NULL) *count_max = 0; + if (count != NULL) + *count = - GFC_INTEGER_4_HUGE; + if (count_rate != NULL) + *count_rate = 0; + if (count_max != NULL) + *count_max = 0; + return; } #elif defined(HAVE_TIME_H) time_t t, t1; @@ -118,7 +122,7 @@ system_clock_4(GFC_INTEGER_4 *count, GFC_INTEGER_4 *count_rate, cnt = - GFC_INTEGER_4_HUGE; mx = 0; } - else if (t0 == (time_t) -2) + else if (t0 == (time_t) -2) t0 = t1; else { @@ -131,9 +135,12 @@ system_clock_4(GFC_INTEGER_4 *count, GFC_INTEGER_4 *count_rate, cnt = - GFC_INTEGER_4_HUGE; mx = 0; #endif - if (count != NULL) *count = cnt; - if (count_rate != NULL) *count_rate = TCK; - if (count_max != NULL) *count_max = mx; + if (count != NULL) + *count = cnt; + if (count_rate != NULL) + *count_rate = TCK; + if (count_max != NULL) + *count_max = mx; } @@ -180,9 +187,14 @@ system_clock_8 (GFC_INTEGER_8 *count, GFC_INTEGER_8 *count_rate, } else { - if (count != NULL) *count = - GFC_INTEGER_8_HUGE; - if (count_rate != NULL) *count_rate = 0; - if (count_max != NULL) *count_max = 0; + if (count != NULL) + *count = - GFC_INTEGER_8_HUGE; + if (count_rate != NULL) + *count_rate = 0; + if (count_max != NULL) + *count_max = 0; + + return; } #elif defined(HAVE_TIME_H) time_t t, t1; @@ -194,7 +206,7 @@ system_clock_8 (GFC_INTEGER_8 *count, GFC_INTEGER_8 *count_rate, cnt = - GFC_INTEGER_8_HUGE; mx = 0; } - else if (t0 == (time_t) -2) + else if (t0 == (time_t) -2) t0 = t1; else { diff --git a/libgfortran/io/write.c b/libgfortran/io/write.c index 86ca40ffa4c..494a7a9bd42 100644 --- a/libgfortran/io/write.c +++ b/libgfortran/io/write.c @@ -1490,7 +1490,7 @@ nml_write_obj (namelist_info * obj, index_type offset, { strcat (ext_name, dim_i ? "" : "("); clen = strlen (ext_name); - st_sprintf (ext_name + clen, "%ld", (long) obj->ls[dim_i].idx); + st_sprintf (ext_name + clen, "%d", (int) obj->ls[dim_i].idx); strcat (ext_name, (dim_i == obj->var_rank - 1) ? ")" : ","); } |