• R/O
  • SSH
  • HTTPS

eirrepo: コミット


コミットメタ情報

リビジョン283 (tree)
日時2020-01-15 17:56:50
作者quiret

ログメッセージ

- tiny bugfix
- adjustments

変更サマリ

差分

--- timelib/src/dates.cpp (revision 282)
+++ timelib/src/dates.cpp (revision 283)
@@ -125,12 +125,12 @@
125125 {
126126 date out;
127127
128- int fillCount = sscanf( dateString, "%u-%u-%u", &out.year, &out.month, &out.day );
128+ int fillCount = sscanf( dateString, "%ld-%u-%u", &out.year, &out.month, &out.day );
129129
130130 if ( fillCount != 3 )
131131 {
132132 // Try the German pattern.
133- fillCount = sscanf( dateString, "%u.%u.%u", &out.day, &out.month, &out.year );
133+ fillCount = sscanf( dateString, "%u.%u.%ld", &out.day, &out.month, &out.year );
134134
135135 if ( fillCount != 3 )
136136 {
@@ -182,4 +182,4 @@
182182 result.year = (long)timeinfo->tm_year + 1900;
183183
184184 return result;
185-}
\ No newline at end of file
185+}
--- timelib/src/times.cpp (revision 282)
+++ timelib/src/times.cpp (revision 283)
@@ -7,7 +7,7 @@
77 void timep::add_hours( unsigned int hours )
88 {
99 unsigned int num_days = ( hours / 24 );
10-
10+
1111 this->add_days( num_days );
1212
1313 hours = ( hours % 24 );
@@ -176,15 +176,15 @@
176176 {
177177 return
178178 ( mday >= mdays_minusweek ) && (
179- ( wday > eWeekday::SUNDAY ) || ( wday == eWeekday::SUNDAY ) && ( this->hour >= 3 )
179+ ( wday > eWeekday::SUNDAY ) || ( ( wday == eWeekday::SUNDAY ) && ( this->hour >= 3 ) )
180180 );
181181 }
182182 else // if ( month == 10 )
183183 {
184184 return
185- ( mday < mdays_minusweek ) || ( mday >= mdays_minusweek ) && (
186- ( wday < eWeekday::SUNDAY ) || ( wday == eWeekday::SUNDAY ) && ( this->hour < 3 )
187- );
185+ ( mday < mdays_minusweek ) || ( ( mday >= mdays_minusweek ) && (
186+ ( wday < eWeekday::SUNDAY ) || ( ( wday == eWeekday::SUNDAY ) && ( this->hour < 3 ) )
187+ ) );
188188 }
189189 }
190190
@@ -212,4 +212,4 @@
212212
213213 // We return time in UTC without timezone offset.
214214 return result;
215-}
\ No newline at end of file
215+}
旧リポジトリブラウザで表示