From: Paul Eggert Date: Mon, 26 Aug 2013 21:31:50 +0000 (-0700) Subject: Fix minor problems found by static checking. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1686^2~109 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f462f0750f4cd3537ab1da5cf8ed64e08e55ea46;p=emacs.git 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. --- diff --git a/src/ChangeLog b/src/ChangeLog index bece374f080..01f3093b6dd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,19 @@ +2013-08-26 Paul Eggert + + 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. + 2013-08-26 Stefan Monnier * lread.c (substitute_object_recurse): Handle hash-tables as well 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 diff --git a/src/nsmenu.m b/src/nsmenu.m index 5af813ac758..7fe84343f1c 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -730,7 +730,7 @@ extern NSString *NSMenuDidBeginTrackingNotification; - (void)fillWithWidgetValue: (void *)wvptr { - [self fillWithWidgetValue: wvptr frame:nil]; + [self fillWithWidgetValue: wvptr frame: (struct frame *)nil]; } - (void)fillWithWidgetValue: (void *)wvptr frame: (struct frame *)f diff --git a/src/nsterm.h b/src/nsterm.h index c34067991f6..a3174ade07b 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -874,8 +874,8 @@ extern int x_display_pixel_width (struct ns_display_info *); /* This in nsterm.m */ extern void x_destroy_window (struct frame *f); extern int ns_select (int nfds, fd_set *readfds, fd_set *writefds, - fd_set *exceptfds, EMACS_TIME *timeout, - sigset_t *sigmask); + fd_set *exceptfds, EMACS_TIME const *timeout, + sigset_t const *sigmask); extern unsigned long ns_get_rgb_color (struct frame *f, float r, float g, float b, float a); extern NSPoint last_mouse_motion_position; diff --git a/src/nsterm.m b/src/nsterm.m index 287c119ba73..f7cc5933a53 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -3540,7 +3540,8 @@ ns_read_socket (struct terminal *terminal, struct input_event *hold_quit) int ns_select (int nfds, fd_set *readfds, fd_set *writefds, - fd_set *exceptfds, EMACS_TIME *timeout, sigset_t *sigmask) + fd_set *exceptfds, EMACS_TIME const *timeout, + sigset_t const *sigmask) /* -------------------------------------------------------------------------- Replacement for select, checking for events -------------------------------------------------------------------------- */ @@ -3666,7 +3667,6 @@ ns_select (int nfds, fd_set *readfds, fd_set *writefds, pthread_mutex_lock (&select_mutex); if (readfds) *readfds = select_readfds; if (writefds) *writefds = select_writefds; - if (timeout) *timeout = select_timeout; pthread_mutex_unlock (&select_mutex); result = t; } diff --git a/src/regex.c b/src/regex.c index 06a9db2c55c..2363fe2a290 100644 --- a/src/regex.c +++ b/src/regex.c @@ -1238,12 +1238,12 @@ re_set_syntax (reg_syntax_t syntax) WEAK_ALIAS (__re_set_syntax, re_set_syntax) /* Regexp to use to replace spaces, or NULL meaning don't. */ -static re_char *whitespace_regexp; +static const_re_char *whitespace_regexp; void re_set_whitespace_regexp (const char *regexp) { - whitespace_regexp = (re_char *) regexp; + whitespace_regexp = (const_re_char *) regexp; } WEAK_ALIAS (__re_set_syntax, re_set_syntax) diff --git a/src/xfaces.c b/src/xfaces.c index b76f9d24180..a55ac90086d 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -236,7 +236,6 @@ along with GNU Emacs. If not, see . */ #ifdef HAVE_NS #undef FRAME_X_DISPLAY_INFO #define FRAME_X_DISPLAY_INFO FRAME_NS_DISPLAY_INFO -#define x_display_info ns_display_info #define GCGraphicsExposures 0 #endif /* HAVE_NS */ #endif /* HAVE_WINDOW_SYSTEM */ diff --git a/src/xgselect.c b/src/xgselect.c index 4d90298a9d9..97f53373b63 100644 --- a/src/xgselect.c +++ b/src/xgselect.c @@ -29,10 +29,11 @@ along with GNU Emacs. If not, see . */ int xg_select (int fds_lim, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, - EMACS_TIME *timeout, sigset_t *sigmask) + EMACS_TIME const *timeout, sigset_t const *sigmask) { SELECT_TYPE all_rfds, all_wfds; - EMACS_TIME tmo, *tmop = timeout; + EMACS_TIME tmo; + EMACS_TIME const *tmop = timeout; GMainContext *context; int have_wfds = wfds != NULL; diff --git a/src/xgselect.h b/src/xgselect.h index f142e85d877..21c8acf1016 100644 --- a/src/xgselect.h +++ b/src/xgselect.h @@ -28,7 +28,7 @@ extern int xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, - EMACS_TIME *timeout, - sigset_t *sigmask); + EMACS_TIME const *timeout, + sigset_t const *sigmask); #endif /* XGSELECT_H */