From 3cf6b4d6577c2f467dbb25dd0da8cdc6ad32a7b4 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 13 Apr 2014 14:32:20 -0600 Subject: More trailing whilespace removal --- nuttx/libnx/nxfonts/nxfonts_convert.c | 2 +- nuttx/libnx/nxfonts/nxfonts_getfont.c | 4 ++-- nuttx/libnx/nxfonts/nxfonts_mono5x8.h | 2 +- nuttx/libnx/nxfonts/nxfonts_sans17x22.h | 2 +- nuttx/libnx/nxfonts/nxfonts_sans17x23b.h | 2 +- nuttx/libnx/nxfonts/nxfonts_sans20x26.h | 2 +- nuttx/libnx/nxfonts/nxfonts_sans20x27b.h | 2 +- nuttx/libnx/nxfonts/nxfonts_sans22x29.h | 2 +- nuttx/libnx/nxfonts/nxfonts_sans22x29b.h | 2 +- nuttx/libnx/nxfonts/nxfonts_sans28x37.h | 2 +- nuttx/libnx/nxfonts/nxfonts_sans39x48.h | 2 +- nuttx/libnx/nxfonts/nxfonts_serif22x28b.h | 2 +- nuttx/libnx/nxfonts/nxfonts_serif22x29.h | 2 +- nuttx/libnx/nxfonts/nxfonts_serif27x38b.h | 2 +- nuttx/libnx/nxfonts/nxfonts_serif29x37.h | 4 ++-- nuttx/libnx/nxfonts/nxfonts_serif38x48.h | 2 +- nuttx/libnx/nxfonts/nxfonts_serif38x49b.h | 2 +- nuttx/libnx/nxglib/nxglib_circlepts.c | 2 +- nuttx/libnx/nxglib/nxglib_circletraps.c | 2 +- nuttx/libnx/nxglib/nxglib_rectunion.c | 2 +- nuttx/libnx/nxmu/nx_bitmap.c | 16 ++++++++-------- nuttx/libnx/nxmu/nx_getrectangle.c | 16 ++++++++-------- nuttx/libnx/nxtk/nxtk_drawcircletoolbar.c | 2 +- nuttx/libnx/nxtk/nxtk_drawcirclewindow.c | 2 +- nuttx/libnx/nxtk/nxtk_drawframe.c | 2 +- nuttx/libnx/nxtk/nxtk_filltrapwindow.c | 4 ++-- nuttx/libnx/nxtk/nxtk_movetoolbar.c | 2 +- nuttx/libnx/nxtk/nxtk_movewindow.c | 2 +- 28 files changed, 45 insertions(+), 45 deletions(-) (limited to 'nuttx/libnx') diff --git a/nuttx/libnx/nxfonts/nxfonts_convert.c b/nuttx/libnx/nxfonts/nxfonts_convert.c index 7f61f8cc8..a223c7f0a 100644 --- a/nuttx/libnx/nxfonts/nxfonts_convert.c +++ b/nuttx/libnx/nxfonts/nxfonts_convert.c @@ -234,7 +234,7 @@ int NXF_FUNCNAME(nxf_convert,NXFONTS_SUFFIX) } /* The entire glyph row has been rendered. Handle any fractional bytes at - * the end of the row + * the end of the row */ if (nbits > 0) diff --git a/nuttx/libnx/nxfonts/nxfonts_getfont.c b/nuttx/libnx/nxfonts/nxfonts_getfont.c index f0b65fd91..d914e2b08 100644 --- a/nuttx/libnx/nxfonts/nxfonts_getfont.c +++ b/nuttx/libnx/nxfonts/nxfonts_getfont.c @@ -150,7 +150,7 @@ static FAR const struct nx_fontpackage_s *g_fontpackages[] = #ifdef CONFIG_NXFONT_MONO5X8 &g_mono5x8_package, #endif - + /* SANS */ #ifdef CONFIG_NXFONT_SANS17X22 @@ -336,7 +336,7 @@ NXHANDLE nxf_getfonthandle(enum nx_fontid_e fontid) return (NXHANDLE)package; } - + /* No.. is it the default font? */ else if (package->id == NXFONT_DEFAULT) diff --git a/nuttx/libnx/nxfonts/nxfonts_mono5x8.h b/nuttx/libnx/nxfonts/nxfonts_mono5x8.h index e2fa23b39..9d0fc49db 100644 --- a/nuttx/libnx/nxfonts/nxfonts_mono5x8.h +++ b/nuttx/libnx/nxfonts/nxfonts_mono5x8.h @@ -3,7 +3,7 @@ * * Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved. * Author: Petteri Aimonen - * + * * Based on 5x8.pcf.gz from xfonts-base. The file is marked as * COPYRIGHT "Public domain font. Share and enjoy." * diff --git a/nuttx/libnx/nxfonts/nxfonts_sans17x22.h b/nuttx/libnx/nxfonts/nxfonts_sans17x22.h index 712cf4a13..992c21850 100644 --- a/nuttx/libnx/nxfonts/nxfonts_sans17x22.h +++ b/nuttx/libnx/nxfonts/nxfonts_sans17x22.h @@ -55,7 +55,7 @@ #define NXFONT_MIN8BIT 161 #define NXFONT_MAX8BIT 255 - + /* Maximum height and width of any glyph in the set */ #define NXFONT_MAXHEIGHT 22 diff --git a/nuttx/libnx/nxfonts/nxfonts_sans17x23b.h b/nuttx/libnx/nxfonts/nxfonts_sans17x23b.h index 709e7f9e5..1d7928849 100644 --- a/nuttx/libnx/nxfonts/nxfonts_sans17x23b.h +++ b/nuttx/libnx/nxfonts/nxfonts_sans17x23b.h @@ -55,7 +55,7 @@ #define NXFONT_MIN8BIT 161 #define NXFONT_MAX8BIT 255 - + /* Maximum height and width of any glyph in the set */ #define NXFONT_MAXHEIGHT 23 diff --git a/nuttx/libnx/nxfonts/nxfonts_sans20x26.h b/nuttx/libnx/nxfonts/nxfonts_sans20x26.h index fa1b2f8a9..4fd32774f 100644 --- a/nuttx/libnx/nxfonts/nxfonts_sans20x26.h +++ b/nuttx/libnx/nxfonts/nxfonts_sans20x26.h @@ -55,7 +55,7 @@ #define NXFONT_MIN8BIT 161 #define NXFONT_MAX8BIT 255 - + /* Maximum height and width of any glyph in the set */ #define NXFONT_MAXHEIGHT 26 diff --git a/nuttx/libnx/nxfonts/nxfonts_sans20x27b.h b/nuttx/libnx/nxfonts/nxfonts_sans20x27b.h index b904b29c1..cbc03b278 100644 --- a/nuttx/libnx/nxfonts/nxfonts_sans20x27b.h +++ b/nuttx/libnx/nxfonts/nxfonts_sans20x27b.h @@ -55,7 +55,7 @@ #define NXFONT_MIN8BIT 161 #define NXFONT_MAX8BIT 255 - + /* Maximum height and width of any glyph in the set */ #define NXFONT_MAXHEIGHT 27 diff --git a/nuttx/libnx/nxfonts/nxfonts_sans22x29.h b/nuttx/libnx/nxfonts/nxfonts_sans22x29.h index a60145c6c..082d9e283 100644 --- a/nuttx/libnx/nxfonts/nxfonts_sans22x29.h +++ b/nuttx/libnx/nxfonts/nxfonts_sans22x29.h @@ -55,7 +55,7 @@ #define NXFONT_MIN8BIT 161 #define NXFONT_MAX8BIT 255 - + /* Maximum height and width of any glyph in the set */ #define NXFONT_MAXHEIGHT 29 diff --git a/nuttx/libnx/nxfonts/nxfonts_sans22x29b.h b/nuttx/libnx/nxfonts/nxfonts_sans22x29b.h index 5e836773c..0228b021b 100644 --- a/nuttx/libnx/nxfonts/nxfonts_sans22x29b.h +++ b/nuttx/libnx/nxfonts/nxfonts_sans22x29b.h @@ -55,7 +55,7 @@ #define NXFONT_MIN8BIT 161 #define NXFONT_MAX8BIT 255 - + /* Maximum height and width of any glyph in the set */ #define NXFONT_MAXHEIGHT 29 diff --git a/nuttx/libnx/nxfonts/nxfonts_sans28x37.h b/nuttx/libnx/nxfonts/nxfonts_sans28x37.h index 85408b8c7..81c08caa6 100644 --- a/nuttx/libnx/nxfonts/nxfonts_sans28x37.h +++ b/nuttx/libnx/nxfonts/nxfonts_sans28x37.h @@ -55,7 +55,7 @@ #define NXFONT_MIN8BIT 161 #define NXFONT_MAX8BIT 255 - + /* Maximum height and width of any glyph in the set */ #define NXFONT_MAXHEIGHT 37 diff --git a/nuttx/libnx/nxfonts/nxfonts_sans39x48.h b/nuttx/libnx/nxfonts/nxfonts_sans39x48.h index 6a0f749ca..405f5d01b 100644 --- a/nuttx/libnx/nxfonts/nxfonts_sans39x48.h +++ b/nuttx/libnx/nxfonts/nxfonts_sans39x48.h @@ -55,7 +55,7 @@ #define NXFONT_MIN8BIT 161 #define NXFONT_MAX8BIT 255 - + /* Maximum height and width of any glyph in the set */ #define NXFONT_MAXHEIGHT 48 diff --git a/nuttx/libnx/nxfonts/nxfonts_serif22x28b.h b/nuttx/libnx/nxfonts/nxfonts_serif22x28b.h index 8dac8d2aa..345f798d8 100644 --- a/nuttx/libnx/nxfonts/nxfonts_serif22x28b.h +++ b/nuttx/libnx/nxfonts/nxfonts_serif22x28b.h @@ -55,7 +55,7 @@ #define NXFONT_MIN8BIT 161 #define NXFONT_MAX8BIT 255 - + /* Maximum height and width of any glyph in the set */ #define NXFONT_MAXHEIGHT 28 diff --git a/nuttx/libnx/nxfonts/nxfonts_serif22x29.h b/nuttx/libnx/nxfonts/nxfonts_serif22x29.h index eec8ec338..b9299994b 100644 --- a/nuttx/libnx/nxfonts/nxfonts_serif22x29.h +++ b/nuttx/libnx/nxfonts/nxfonts_serif22x29.h @@ -55,7 +55,7 @@ #define NXFONT_MIN8BIT 161 #define NXFONT_MAX8BIT 255 - + /* Maximum height and width of any glyph in the set */ #define NXFONT_MAXHEIGHT 29 diff --git a/nuttx/libnx/nxfonts/nxfonts_serif27x38b.h b/nuttx/libnx/nxfonts/nxfonts_serif27x38b.h index 8d1a34441..7fd61db05 100644 --- a/nuttx/libnx/nxfonts/nxfonts_serif27x38b.h +++ b/nuttx/libnx/nxfonts/nxfonts_serif27x38b.h @@ -55,7 +55,7 @@ #define NXFONT_MIN8BIT 161 #define NXFONT_MAX8BIT 255 - + /* Maximum height and width of any glyph in the set */ #define NXFONT_MAXHEIGHT 38 diff --git a/nuttx/libnx/nxfonts/nxfonts_serif29x37.h b/nuttx/libnx/nxfonts/nxfonts_serif29x37.h index f6648fa44..8627bd8b3 100644 --- a/nuttx/libnx/nxfonts/nxfonts_serif29x37.h +++ b/nuttx/libnx/nxfonts/nxfonts_serif29x37.h @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************/ - + #ifndef __GRAPHICS_NXFONTS_NXFONTS_SERIF29X37_H #define __GRAPHICS_NXFONTS_NXFONTS_SERIF29X37_H @@ -55,7 +55,7 @@ #define NXFONT_MIN8BIT 161 #define NXFONT_MAX8BIT 255 - + /* Maximum height and width of any glyph in the set */ #define NXFONT_MAXHEIGHT 37 diff --git a/nuttx/libnx/nxfonts/nxfonts_serif38x48.h b/nuttx/libnx/nxfonts/nxfonts_serif38x48.h index 7603e3091..466ce8ad7 100644 --- a/nuttx/libnx/nxfonts/nxfonts_serif38x48.h +++ b/nuttx/libnx/nxfonts/nxfonts_serif38x48.h @@ -55,7 +55,7 @@ #define NXFONT_MIN8BIT 161 #define NXFONT_MAX8BIT 255 - + /* Maximum height and width of any glyph in the set */ #define NXFONT_MAXHEIGHT 48 diff --git a/nuttx/libnx/nxfonts/nxfonts_serif38x49b.h b/nuttx/libnx/nxfonts/nxfonts_serif38x49b.h index 9d9ae4679..3bfe9cb72 100644 --- a/nuttx/libnx/nxfonts/nxfonts_serif38x49b.h +++ b/nuttx/libnx/nxfonts/nxfonts_serif38x49b.h @@ -55,7 +55,7 @@ #define NXFONT_MIN8BIT 161 #define NXFONT_MAX8BIT 255 - + /* Maximum height and width of any glyph in the set */ #define NXFONT_MAXHEIGHT 49 diff --git a/nuttx/libnx/nxglib/nxglib_circlepts.c b/nuttx/libnx/nxglib/nxglib_circlepts.c index 811953dfc..9822b1248 100644 --- a/nuttx/libnx/nxglib/nxglib_circlepts.c +++ b/nuttx/libnx/nxglib/nxglib_circlepts.c @@ -59,7 +59,7 @@ /* Named indices into the 16 circle points generated by nxgl_circlepts */ -#define POINT_0p0 0 +#define POINT_0p0 0 #define POINT_22p5 1 #define POINT_45p0 2 #define POINT_67p5 3 diff --git a/nuttx/libnx/nxglib/nxglib_circletraps.c b/nuttx/libnx/nxglib/nxglib_circletraps.c index 8ee287795..6e49e4d83 100644 --- a/nuttx/libnx/nxglib/nxglib_circletraps.c +++ b/nuttx/libnx/nxglib/nxglib_circletraps.c @@ -165,7 +165,7 @@ void nxgl_circletraps(FAR const struct nxgl_point_s *center, nxgl_coord_t radius circle[2].top.x1 = circle[1].bot.x1; circle[2].top.x2 = circle[1].bot.x2; circle[2].top.y = circle[1].bot.y; - + circle[5].bot.x1 = circle[1].bot.x1; circle[5].bot.x2 = circle[1].bot.x2; circle[5].bot.y = center->y + xoffs; diff --git a/nuttx/libnx/nxglib/nxglib_rectunion.c b/nuttx/libnx/nxglib/nxglib_rectunion.c index 9d805aad0..89b3a7957 100644 --- a/nuttx/libnx/nxglib/nxglib_rectunion.c +++ b/nuttx/libnx/nxglib/nxglib_rectunion.c @@ -69,7 +69,7 @@ * Name: nxgl_rectunion * * Description: - * Given two rectanges, src1 and src2, return the larger rectangle that + * Given two rectanges, src1 and src2, return the larger rectangle that * contains both, dest. * ****************************************************************************/ diff --git a/nuttx/libnx/nxmu/nx_bitmap.c b/nuttx/libnx/nxmu/nx_bitmap.c index 8969f3e11..6ed0096b7 100644 --- a/nuttx/libnx/nxmu/nx_bitmap.c +++ b/nuttx/libnx/nxmu/nx_bitmap.c @@ -125,32 +125,32 @@ int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest, outmsg.origin.y = origin->y; nxgl_rectcopy(&outmsg.dest, dest); - + /* Create a semaphore for tracking command completion */ outmsg.sem_done = &sem_done; ret = sem_init(&sem_done, 0, 0); - + if (ret != OK) { gdbg("sem_init failed: %d\n", errno); return ret; } - + /* Forward the fill command to the server */ ret = nxmu_sendwindow(wnd, &outmsg, sizeof(struct nxsvrmsg_bitmap_s)); - + /* Wait that the command is completed, so that caller can release the buffer. */ - + if (ret == OK) { ret = sem_wait(&sem_done); } - + /* Destroy the semaphore and return. */ - + sem_destroy(&sem_done); - + return ret; } diff --git a/nuttx/libnx/nxmu/nx_getrectangle.c b/nuttx/libnx/nxmu/nx_getrectangle.c index 2adc719a7..a3b9a3a24 100644 --- a/nuttx/libnx/nxmu/nx_getrectangle.c +++ b/nuttx/libnx/nxmu/nx_getrectangle.c @@ -100,7 +100,7 @@ int nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, struct nxsvrmsg_getrectangle_s outmsg; int ret; sem_t sem_done; - + #ifdef CONFIG_DEBUG if (!hwnd || !rect || !dest) { @@ -124,27 +124,27 @@ int nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, outmsg.sem_done = &sem_done; ret = sem_init(&sem_done, 0, 0); - + if (ret != OK) { gdbg("sem_init failed: %d\n", errno); return ret; } - + /* Forward the fill command to the server */ ret = nxmu_sendwindow(wnd, &outmsg, sizeof(struct nxsvrmsg_getrectangle_s)); - + /* Wait that the command is completed, so that caller can release the buffer. */ - + if (ret == OK) { ret = sem_wait(&sem_done); } - + /* Destroy the semaphore and return. */ - + sem_destroy(&sem_done); - + return ret; } diff --git a/nuttx/libnx/nxtk/nxtk_drawcircletoolbar.c b/nuttx/libnx/nxtk/nxtk_drawcircletoolbar.c index 99b1094b7..fa7905cd4 100644 --- a/nuttx/libnx/nxtk/nxtk_drawcircletoolbar.c +++ b/nuttx/libnx/nxtk/nxtk_drawcircletoolbar.c @@ -51,7 +51,7 @@ ****************************************************************************/ /* Named indices into the 16 circle points generated by nxgl_circlepts */ -#define POINT_0p0 0 +#define POINT_0p0 0 #define POINT_22p5 1 #define POINT_45p0 2 #define POINT_67p5 3 diff --git a/nuttx/libnx/nxtk/nxtk_drawcirclewindow.c b/nuttx/libnx/nxtk/nxtk_drawcirclewindow.c index be6bc713f..ec0fe6312 100644 --- a/nuttx/libnx/nxtk/nxtk_drawcirclewindow.c +++ b/nuttx/libnx/nxtk/nxtk_drawcirclewindow.c @@ -51,7 +51,7 @@ ****************************************************************************/ /* Named indices into the 16 circle points generated by nxgl_circlepts */ -#define POINT_0p0 0 +#define POINT_0p0 0 #define POINT_22p5 1 #define POINT_45p0 2 #define POINT_67p5 3 diff --git a/nuttx/libnx/nxtk/nxtk_drawframe.c b/nuttx/libnx/nxtk/nxtk_drawframe.c index e30377dd3..74b23453e 100644 --- a/nuttx/libnx/nxtk/nxtk_drawframe.c +++ b/nuttx/libnx/nxtk/nxtk_drawframe.c @@ -115,7 +115,7 @@ int nxtk_drawframe(FAR struct nxtk_framedwindow_s *fwnd, struct nxgl_size_s tbsize; nxgl_coord_t thickness; - /* Shiny edge: + /* Shiny edge: * Thickness: 1 * Color: CONFIG_NXTK_BORDERCOLOR3; * Condition: CONFIG_NXTK_BORDERWIDTH > 2 diff --git a/nuttx/libnx/nxtk/nxtk_filltrapwindow.c b/nuttx/libnx/nxtk/nxtk_filltrapwindow.c index e28f0d3bc..66aef4184 100644 --- a/nuttx/libnx/nxtk/nxtk_filltrapwindow.c +++ b/nuttx/libnx/nxtk/nxtk_filltrapwindow.c @@ -109,11 +109,11 @@ int nxtk_filltrapwindow(NXTKWINDOW hfwnd, nxgl_trapoffset(&reltrap, trap, fwnd->fwrect.pt1.x - fwnd->wnd.bounds.pt1.x, fwnd->fwrect.pt1.y - fwnd->wnd.bounds.pt1.y); - + /* Perform the fill, clipping to the client window */ nxgl_rectoffset(&relclip, &fwnd->fwrect, -fwnd->wnd.bounds.pt1.x, -fwnd->wnd.bounds.pt1.y); - + return nx_filltrapezoid((NXWINDOW)hfwnd, &relclip, &reltrap, color); } diff --git a/nuttx/libnx/nxtk/nxtk_movetoolbar.c b/nuttx/libnx/nxtk/nxtk_movetoolbar.c index b5f05c096..275bb46e6 100644 --- a/nuttx/libnx/nxtk/nxtk_movetoolbar.c +++ b/nuttx/libnx/nxtk/nxtk_movetoolbar.c @@ -108,7 +108,7 @@ int nxtk_movetoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, #endif /* Make sure that both the source and dest rectangle lie within the - * toolbar sub-window + * toolbar sub-window */ nxtk_subwindowmove(fwnd, &srcrect, &clipoffset, rect, offset, &fwnd->tbrect); diff --git a/nuttx/libnx/nxtk/nxtk_movewindow.c b/nuttx/libnx/nxtk/nxtk_movewindow.c index f9bbbac41..66aed9d16 100644 --- a/nuttx/libnx/nxtk/nxtk_movewindow.c +++ b/nuttx/libnx/nxtk/nxtk_movewindow.c @@ -107,7 +107,7 @@ int nxtk_movewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, #endif /* Make sure that both the source and dest rectangle lie within the - * client sub-window + * client sub-window */ nxtk_subwindowmove(fwnd, &srcrect, &clipoffset, rect, offset, &fwnd->fwrect); -- cgit v1.2.3