svn commit: r288186 - stable/9/games/grdc

Ed Maste emaste at FreeBSD.org
Thu Sep 24 19:42:33 UTC 2015


Author: emaste
Date: Thu Sep 24 19:42:32 2015
New Revision: 288186
URL: https://svnweb.freebsd.org/changeset/base/288186

Log:
  MFC r283929: Correct grdc(1) 12-hour display between 12:00 and 13:00
  
  PM starts at 12:00, not 13:00.
  
  PR:		194291, 200133
  Submitted by:	Nick Price

Modified:
  stable/9/games/grdc/grdc.c
Directory Properties:
  stable/9/games/grdc/   (props changed)

Modified: stable/9/games/grdc/grdc.c
==============================================================================
--- stable/9/games/grdc/grdc.c	Thu Sep 24 19:37:34 2015	(r288185)
+++ stable/9/games/grdc/grdc.c	Thu Sep 24 19:42:32 2015	(r288186)
@@ -150,14 +150,14 @@ main(int argc, char *argv[])
 		set(tm->tm_min/10, 14);
 
 		if (t12) {
-			if (tm->tm_hour > 12) {
-				tm->tm_hour -= 12;
-				mvaddstr(YBASE + 5, XBASE + 52, "PM");
-			} else {
+			if (tm->tm_hour < 12) {
 				if (tm->tm_hour == 0)
 					tm->tm_hour = 12;
-
 				mvaddstr(YBASE + 5, XBASE + 52, "AM");
+			} else {
+				if (tm->tm_hour > 12)
+					tm->tm_hour -= 12;
+				mvaddstr(YBASE + 5, XBASE + 52, "PM");
 			}
 		}
 


More information about the svn-src-stable-9 mailing list