diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-08-26 14:31:50 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-08-26 14:31:50 -0700 |
| commit | f462f0750f4cd3537ab1da5cf8ed64e08e55ea46 (patch) | |
| tree | 8bc31880fcaa044d09553dea12cbb846fda22b33 /src/image.c | |
| parent | 068f9124b4cb785f1743f2b50884f819d9d34f47 (diff) | |
| download | emacs-f462f0750f4cd3537ab1da5cf8ed64e08e55ea46.tar.gz | |
Fix minor problems found by static checking.
* image.c (XGetPixel, XPutPixel) [HAVE_NS]: Now static.
(expect): Avoid nested-if warning.
(x_build_heuristic_mask) [HAVE_NS]: Avoid unused-var warning.
* nsmenu.m (fillWithWidgetValue:): Avoid type warning.
* nsterm.h, nsterm.m (ns_select):
* xgselect.c, xgselect.h (xg_select):
Adjust signature to better match pselect's.
* nsterm.m (ns_select):
Don't set *TIMEOUT, since pselect doesn't.
* regex.c (whitespace_regexp): Now const_re_char *, to avoid
diagnostic about assigning const char * to it.
* xfaces.c (x_display_info) [HAVE_NS]: Remove; unused.
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/src/image.c b/src/image.c index 2db44d07c81..59347161576 100644 --- a/src/image.c +++ b/src/image.c @@ -145,7 +145,7 @@ static Lisp_Object QCmax_width, QCmax_height; #ifdef HAVE_NS /* Use with images created by ns_image_for_XPM. */ -unsigned long +static unsigned long XGetPixel (XImagePtr ximage, int x, int y) { return ns_get_pixel (ximage, x, y); @@ -153,7 +153,7 @@ XGetPixel (XImagePtr ximage, int x, int y) /* Use with images created by ns_image_for_XPM; alpha set to 1; pixel is assumed to be in RGB form. */ -void +static void XPutPixel (XImagePtr ximage, int x, int y, unsigned long pixel) { ns_put_pixel (ximage, x, y, pixel); @@ -2713,10 +2713,13 @@ xbm_read_bitmap_data (struct frame *f, unsigned char *contents, unsigned char *e LA1 = xbm_scan (&s, end, buffer, &value) #define expect(TOKEN) \ - if (LA1 != (TOKEN)) \ - goto failure; \ - else \ - match () + do \ + { \ + if (LA1 != (TOKEN)) \ + goto failure; \ + match (); \ + } \ + while (0) #define expect_ident(IDENT) \ if (LA1 == XBM_TK_IDENT && strcmp (buffer, (IDENT)) == 0) \ @@ -3976,10 +3979,13 @@ xpm_load_image (struct frame *f, LA1 = xpm_scan (&s, end, &beg, &len) #define expect(TOKEN) \ - if (LA1 != (TOKEN)) \ - goto failure; \ - else \ - match () + do \ + { \ + if (LA1 != (TOKEN)) \ + goto failure; \ + match (); \ + } \ + while (0) #define expect_ident(IDENT) \ if (LA1 == XPM_TK_IDENT \ @@ -4932,7 +4938,7 @@ x_build_heuristic_mask (struct frame *f, struct image *img, Lisp_Object how) int row_width; #endif /* HAVE_NTGUI */ int x, y; - bool rc, use_img_background; + bool use_img_background; unsigned long bg = 0; if (img->mask) @@ -4941,9 +4947,8 @@ x_build_heuristic_mask (struct frame *f, struct image *img, Lisp_Object how) #ifndef HAVE_NTGUI #ifndef HAVE_NS /* Create an image and pixmap serving as mask. */ - rc = image_create_x_image_and_pixmap (f, img, img->width, img->height, 1, - &mask_img, 1); - if (!rc) + if (! image_create_x_image_and_pixmap (f, img, img->width, img->height, 1, + &mask_img, 1)) return; #endif /* !HAVE_NS */ #else |