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.
/* 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).
}
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;
cnt = - GFC_INTEGER_4_HUGE;
mx = 0;
}
- else if (t0 == (time_t) -2)
+ else if (t0 == (time_t) -2)
t0 = t1;
else
{
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;
}
}
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;
cnt = - GFC_INTEGER_8_HUGE;
mx = 0;
}
- else if (t0 == (time_t) -2)
+ else if (t0 == (time_t) -2)
t0 = t1;
else
{
{
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) ? ")" : ",");
}