diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-09 11:37:41 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-09 11:37:41 +0000 |
| commit | 844707a09d37422f341c2f9548744fd2642ea6a3 (patch) | |
| tree | 94130384b11bc844531c0b67f94520189a553bde | |
| parent | 166d507a73531a6401f995573a844181feca8245 (diff) | |
| download | ATCD-844707a09d37422f341c2f9548744fd2642ea6a3.tar.gz | |
Tue Sep 9 11:36:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_time.cpp | 41 |
2 files changed, 28 insertions, 19 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 113c0b8df7b..402ad16ee5c 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Tue Sep 9 11:36:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_time.cpp (strptime_emulation): + Clear the struct tm before filling it. Without we get a random + value back if the user doesn't use a full date. + Tue Sep 9 11:31:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * bin/MakeProjectCreator/modules/VXTestProjectCreator.pm: diff --git a/ACE/ace/OS_NS_time.cpp b/ACE/ace/OS_NS_time.cpp index 18f5b73c15c..5c485d9c586 100644 --- a/ACE/ace/OS_NS_time.cpp +++ b/ACE/ace/OS_NS_time.cpp @@ -238,7 +238,7 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res) ACE_OS_GUARD ACE_UNUSED_ARG (res); - struct tm * res_ptr; + struct tm * res_ptr = 0; ACE_OSCALL (::localtime (t), struct tm *, 0, res_ptr); if (res_ptr == 0) return 0; @@ -360,22 +360,25 @@ ACE_OS::strptime_emulation (const char *buf, const char *format, struct tm *tm) { int bi = 0; int fi = 0; - int percent = 0; + bool percent = false; if (!buf || !format) return 0; + ACE_OS::memset (tm, 0, sizeof (struct tm)); + while (format[fi] != '\0') { if (percent) { - percent = 0; + percent = false; switch (format[fi]) { case '%': // an escaped % if (buf[bi] == '%') { - fi++; bi++; + ++fi; + ++bi; } else return const_cast<char*> (buf + bi); @@ -422,22 +425,22 @@ ACE_OS::strptime_emulation (const char *buf, const char *format, struct tm *tm) (buf + bi, &tm->tm_mon, &bi, &fi, 1, 12)) return const_cast<char*> (buf + bi); - fi--; + --fi; tm->tm_mon--; if (buf[bi] != '/') return const_cast<char*> (buf + bi); - bi++; + ++bi; if (!ACE_OS::strptime_getnum (buf + bi, &tm->tm_mday, &bi, &fi, 1, 31)) return const_cast<char*> (buf + bi); - fi--; + --fi; if (buf[bi] != '/') return const_cast<char*> (buf + bi); - bi++; + ++bi; if (!ACE_OS::strptime_getnum (buf + bi, &tm->tm_year, &bi, &fi, 0, 99)) return const_cast<char*> (buf + bi); @@ -498,10 +501,10 @@ ACE_OS::strptime_emulation (const char *buf, const char *format, struct tm *tm) (buf + bi, &tm->tm_hour, &bi, &fi, 0, 23)) return const_cast<char*> (buf + bi); - fi--; + --fi; if (buf[bi] != ':') return const_cast<char*> (buf + bi); - bi++; + ++bi; if (!ACE_OS::strptime_getnum (buf + bi, &tm->tm_min, &bi, &fi, 0, 59)) return const_cast<char*> (buf + bi); @@ -519,18 +522,18 @@ ACE_OS::strptime_emulation (const char *buf, const char *format, struct tm *tm) (buf + bi, &tm->tm_hour, &bi, &fi, 0, 23)) return const_cast<char*> (buf + bi); - fi--; + --fi; if (buf[bi] != ':') return const_cast<char*> (buf + bi); - bi++; + ++bi; if (!ACE_OS::strptime_getnum (buf + bi, &tm->tm_min, &bi, &fi, 0, 59)) return const_cast<char*> (buf + bi); - fi--; + --fi; if (buf[bi] != ':') return const_cast<char*> (buf + bi); - bi++; + ++bi; if (!ACE_OS::strptime_getnum (buf + bi, &tm->tm_sec, &bi, &fi, 0, 61)) return const_cast<char*> (buf + bi); @@ -580,15 +583,15 @@ ACE_OS::strptime_emulation (const char *buf, const char *format, struct tm *tm) { /* if (percent) */ if (format[fi] == '%') { - percent = 1; - fi++; + percent = true; + ++fi; } else { if (format[fi] == buf[bi]) { - fi++; - bi++; + ++fi; + ++bi; } else return const_cast<char*> (buf + bi); @@ -614,7 +617,7 @@ ACE_OS::strptime_getnum (const char *buf, tmp = (tmp * 10) + (buf[i] - '0'); if (max && (tmp > max)) return 0; - i++; + ++i; } if (tmp < min) |