From 657d08d30a63536174fe9ec60b7f2cb8de541eb5 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 27 Oct 2011 02:59:21 +0200 Subject: [PATCH] src/image.c, src/w32*.c, lib-src/emacsclient.c: Silence warnings under -Wall. --- lib-src/ChangeLog | 4 ++++ lib-src/emacsclient.c | 4 ++-- src/ChangeLog | 7 +++++++ src/image.c | 2 +- src/w32.c | 6 +++--- src/w32font.c | 4 ++-- src/w32reg.c | 7 +++---- 7 files changed, 22 insertions(+), 12 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 984c4d6c880..a8f9a0ac4be 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2011-10-27 Juanma Barranquero + + * emacsclient.c (w32_getenv): Silence compiler warnings. + 2011-09-07 Glenn Morris * etags.c (Fortran_functions): Handle "elemental" functions. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index ece9dc65c49..76aa21884de 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -359,7 +359,7 @@ w32_getenv (char *envvar) char *value; DWORD dwType; - if (value = getenv (envvar)) + if ((value = getenv (envvar))) /* Found in the environment. strdup it, because values returned by getenv cannot be free'd. */ return xstrdup (value); @@ -382,7 +382,7 @@ w32_getenv (char *envvar) { DWORD size; - if (size = ExpandEnvironmentStrings (value, NULL, 0)) + if ((size = ExpandEnvironmentStrings (value, NULL, 0))) { char *buffer = (char *) xmalloc (size); if (ExpandEnvironmentStrings (value, buffer, size)) diff --git a/src/ChangeLog b/src/ChangeLog index b3d8d4d10ca..3caecf32049 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2011-10-27 Juanma Barranquero + + * image.c (x_create_x_image_and_pixmap): + * w32.c (sys_rename, w32_delayed_load): + * w32font.c (fill_in_logfont): + * w32reg.c (x_get_string_resource): Silence compiler warnings. + 2011-10-26 Juanma Barranquero * w32fns.c (w32_default_color_map): New function, diff --git a/src/image.c b/src/image.c index ef72745a72f..14c74f10607 100644 --- a/src/image.c +++ b/src/image.c @@ -2015,7 +2015,7 @@ x_create_x_image_and_pixmap (struct frame *f, int width, int height, int depth, /* Bitmaps with a depth less than 16 need a palette. */ /* BITMAPINFO structure already contains the first RGBQUAD. */ if (depth < 16) - palette_colors = 1 << depth - 1; + palette_colors = 1 << (depth - 1); *ximg = xmalloc (sizeof (XImage) + palette_colors * sizeof (RGBQUAD)); diff --git a/src/w32.c b/src/w32.c index 91893ddfc61..42546fc8d49 100644 --- a/src/w32.c +++ b/src/w32.c @@ -2892,12 +2892,12 @@ sys_rename (const char * oldname, const char * newname) int i = 0; oldname = map_w32_filename (oldname, NULL); - if (o = strrchr (oldname, '\\')) + if ((o = strrchr (oldname, '\\'))) o++; else o = (char *) oldname; - if (p = strrchr (temp, '\\')) + if ((p = strrchr (temp, '\\'))) p++; else p = temp; @@ -5756,7 +5756,7 @@ w32_delayed_load (Lisp_Object libraries, Lisp_Object library_id) for (dlls = XCDR (dlls); CONSP (dlls); dlls = XCDR (dlls)) { CHECK_STRING_CAR (dlls); - if (library_dll = LoadLibrary (SDATA (XCAR (dlls)))) + if ((library_dll = LoadLibrary (SDATA (XCAR (dlls))))) { found = XCAR (dlls); break; diff --git a/src/w32font.c b/src/w32font.c index 985370c15c1..f47b7a46b1e 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -1916,10 +1916,10 @@ fill_in_logfont (FRAME_PTR f, LOGFONT *logfont, Lisp_Object font_spec) int spacing = XINT (tmp); if (spacing < FONT_SPACING_MONO) logfont->lfPitchAndFamily - = logfont->lfPitchAndFamily & 0xF0 | VARIABLE_PITCH; + = (logfont->lfPitchAndFamily & 0xF0) | VARIABLE_PITCH; else logfont->lfPitchAndFamily - = logfont->lfPitchAndFamily & 0xF0 | FIXED_PITCH; + = (logfont->lfPitchAndFamily & 0xF0) | FIXED_PITCH; } /* Process EXTRA info. */ diff --git a/src/w32reg.c b/src/w32reg.c index e1465be9e44..18374431062 100644 --- a/src/w32reg.c +++ b/src/w32reg.c @@ -147,9 +147,9 @@ x_get_string_resource (XrmDatabase rdb, char *name, char *class) { char *resource; - if (resource = w32_get_rdb_resource (rdb, name)) + if ((resource = w32_get_rdb_resource (rdb, name))) return resource; - if (resource = w32_get_rdb_resource (rdb, class)) + if ((resource = w32_get_rdb_resource (rdb, class))) return resource; } @@ -157,6 +157,5 @@ x_get_string_resource (XrmDatabase rdb, char *name, char *class) /* --quick was passed, so this is a no-op. */ return NULL; - return (w32_get_string_resource (name, class, REG_SZ)); + return w32_get_string_resource (name, class, REG_SZ); } - -- 2.11.4.GIT