diff options
author | Jakub Jelinek <jakub@redhat.com> | 2010-08-17 20:08:05 +0200 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2010-08-17 20:08:05 +0200 |
commit | 47b914698dd6a773392a881fc5afc9b8929b324c (patch) | |
tree | a116d1b19f474b35987ce4e962e78b89ef101e20 /libgfortran/intrinsics | |
parent | 35d3d688fc4b8adde86a554a5061f2a7d54df6a2 (diff) | |
download | gcc-47b914698dd6a773392a881fc5afc9b8929b324c.zip gcc-47b914698dd6a773392a881fc5afc9b8929b324c.tar.gz gcc-47b914698dd6a773392a881fc5afc9b8929b324c.tar.bz2 |
re PR fortran/45308 ([F2003] DATE_AND_TIME does _not_ blank-pad strings)
PR fortran/45308
* intrinsics/date_and_time.c (date_and_time): Pass __{zone,time,date}_len
instead of {ZONE,TIME,DATE}_LEN as second argument to fstrcpy. Drop
asserts. Adjust comment to the F2003 wording from the F95 wording.
* gfortran.dg/pr45308.f03: New test.
From-SVN: r163312
Diffstat (limited to 'libgfortran/intrinsics')
-rw-r--r-- | libgfortran/intrinsics/date_and_time.c | 57 |
1 files changed, 22 insertions, 35 deletions
diff --git a/libgfortran/intrinsics/date_and_time.c b/libgfortran/intrinsics/date_and_time.c index 21e4320..2ee8e5c 100644 --- a/libgfortran/intrinsics/date_and_time.c +++ b/libgfortran/intrinsics/date_and_time.c @@ -93,29 +93,25 @@ gmtime_r (const time_t * timep, struct tm * result) Arguments: - DATE (optional) shall be scalar and of type default character, and - shall be of length at least 8 in order to contain the complete - value. It is an INTENT(OUT) argument. Its leftmost 8 characters - are assigned a value of the form CCYYMMDD, where CC is the century, - YY the year within the century, MM the month within the year, and - DD the day within the month. If there is no date available, they - are assigned blanks. - - TIME (optional) shall be scalar and of type default character, and - shall be of length at least 10 in order to contain the complete - value. It is an INTENT(OUT) argument. Its leftmost 10 characters - are assigned a value of the form hhmmss.sss, where hh is the hour - of the day, mm is the minutes of the hour, and ss.sss is the - seconds and milliseconds of the minute. If there is no clock - available, they are assigned blanks. - - ZONE (optional) shall be scalar and of type default character, and - shall be of length at least 5 in order to contain the complete - value. It is an INTENT(OUT) argument. Its leftmost 5 characters - are assigned a value of the form [+-]hhmm, where hh and mm are the - time difference with respect to Coordinated Universal Time (UTC) in - hours and parts of an hour expressed in minutes, respectively. If - there is no clock available, they are assigned blanks. + DATE (optional) shall be scalar and of type default character. + It is an INTENT(OUT) argument. It is assigned a value of the + form CCYYMMDD, where CC is the century, YY the year within the + century, MM the month within the year, and DD the day within the + month. If there is no date available, they are assigned blanks. + + TIME (optional) shall be scalar and of type default character. + It is an INTENT(OUT) argument. It is assigned a value of the + form hhmmss.sss, where hh is the hour of the day, mm is the + minutes of the hour, and ss.sss is the seconds and milliseconds + of the minute. If there is no clock available, they are assigned + blanks. + + ZONE (optional) shall be scalar and of type default character. + It is an INTENT(OUT) argument. It is assigned a value of the + form [+-]hhmm, where hh and mm are the time difference with + respect to Coordinated Universal Time (UTC) in hours and parts + of an hour expressed in minutes, respectively. If there is no + clock available, they are assigned blanks. VALUES (optional) shall be of type default integer and of rank one. It is an INTENT(OUT) argument. Its size shall be at least @@ -311,22 +307,13 @@ date_and_time (char *__date, char *__time, char *__zone, } if (__zone) - { - assert (__zone_len >= ZONE_LEN); - fstrcpy (__zone, ZONE_LEN, zone, ZONE_LEN); - } + fstrcpy (__zone, __zone_len, zone, ZONE_LEN); if (__time) - { - assert (__time_len >= TIME_LEN); - fstrcpy (__time, TIME_LEN, timec, TIME_LEN); - } + fstrcpy (__time, __time_len, timec, TIME_LEN); if (__date) - { - assert (__date_len >= DATE_LEN); - fstrcpy (__date, DATE_LEN, date, DATE_LEN); - } + fstrcpy (__date, __date_len, date, DATE_LEN); } |