diff options
-rw-r--r-- | apps/examples/nx/Makefile | 2 | ||||
-rw-r--r-- | apps/examples/nx/nx_kbdin.c | 4 | ||||
-rw-r--r-- | nuttx/lib/time/lib_time.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/apps/examples/nx/Makefile b/apps/examples/nx/Makefile index d0e4c0624..326edd118 100644 --- a/apps/examples/nx/Makefile +++ b/apps/examples/nx/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# apps/examples/nxflat/Makefile +# apps/examples/nx/Makefile # # Copyright (C) 2009-2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/apps/examples/nx/nx_kbdin.c b/apps/examples/nx/nx_kbdin.c index fb0694272..238272533 100644 --- a/apps/examples/nx/nx_kbdin.c +++ b/apps/examples/nx/nx_kbdin.c @@ -116,7 +116,7 @@ static void nxeg_fillchar(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, if (src) { - /* Get the intersection of the redraw region and the characer bitmap */ + /* Get the intersection of the redraw region and the character bitmap */ nxgl_rectintersect(&intersection, rect, &bm->bounds); if (!nxgl_nullrect(&intersection)) @@ -446,7 +446,7 @@ void nxeg_tbkbdin(NXWINDOW hwnd, uint8_t nch, const uint8_t *ch, FAR void *arg) #endif /**************************************************************************** - * Name: nxeg_tbkbdin + * Name: nxeg_filltext ****************************************************************************/ void nxeg_filltext(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, diff --git a/nuttx/lib/time/lib_time.c b/nuttx/lib/time/lib_time.c index 0ddd7993f..02853132b 100644 --- a/nuttx/lib/time/lib_time.c +++ b/nuttx/lib/time/lib_time.c @@ -100,8 +100,9 @@ time_t time(time_t *tloc) { *tloc = tp.tv_sec; } + return tp.tv_sec; - } + } return (time_t)ERROR; } |