OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Andreas Jaeger 2005-05-15 17:33:12 +02:00 committed by Andreas Jaeger
parent 944e86ee09
commit 6b0215364d
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libgfortran/ChangeLog
View File

@ -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.

36
libgfortran/intrinsics/system_clock.c
View File

@ -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
{

2
libgfortran/io/write.c
View File

@ -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) ? ")" : ",");
}