Skip to content

Commit

Permalink
Final tweaks for v2.0.0
Browse files Browse the repository at this point in the history
- Changelog gets release date and official release version
- timeprint help now reports non-beta version
- Fix simple variable name hiding issue.
  • Loading branch information
hollasch committed Feb 26, 2018
1 parent cf53ed0 commit e4ebfc4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Change Log for timeprint
Change Log for `timeprint`
================================================================================

## v2.0.0-beta
## v2.0.0 (2018-02-26)
- Renamed from currtime to timeprint.
- Add new -- switch variants (--help, --codeChar, --timeZone, and so on).
- -e is now -%/--codeChar to eliminate confusion between escape sequences and
Expand Down
2 changes: 1 addition & 1 deletion tests-accepted.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Acceptance Tests for `timeprint`

--------------------------------------------------------------------------------
Test 1: [/?]
timeprint v2.0.0-beta | https://github.com/hollasch/timeprint
timeprint v2.0.0 | https://github.com/hollasch/timeprint
timeprint - Print time and date information

usage: timeprint [--codeChar <char>] [-%<char>]
Expand Down
10 changes: 5 additions & 5 deletions timeprint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@ int wmain (int argc, wchar_t *argv[])

help (params.helpType);

tm currentTime;
time_t deltaTimeSeconds;
tm calculatedTime;
time_t deltaTimeSeconds;

if (calcTime (params, currentTime, deltaTimeSeconds)) {
printResults (params.format, params.codeChar, currentTime, deltaTimeSeconds);
if (calcTime (params, calculatedTime, deltaTimeSeconds)) {
printResults (params.format, params.codeChar, calculatedTime, deltaTimeSeconds);
return 0;
}

Expand Down Expand Up @@ -946,7 +946,7 @@ bool printDeltaFunc (

//__________________________________________________________________________________________________
static auto help_general =
L"timeprint v2.0.0-beta | https://github.com/hollasch/timeprint\n"
L"timeprint v2.0.0 | https://github.com/hollasch/timeprint\n"
L"timeprint - Print time and date information\n"
L"\n"
L"usage: timeprint [--codeChar <char>] [-%<char>]\n"
Expand Down

0 comments on commit e4ebfc4

Please sign in to comment.