diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-08-14 08:27:32 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-08-14 08:27:32 +0400 |
| commit | da5707e8ec8df0a8a9bb1a1f12c6b701314845cc (patch) | |
| tree | f760c12fbef60ff4d1db6ddb26cdecdff1086dae | |
| parent | 25554267037ced56fdaed17e3a09d8926b70f978 (diff) | |
| download | emacs-da5707e8ec8df0a8a9bb1a1f12c6b701314845cc.tar.gz emacs-da5707e8ec8df0a8a9bb1a1f12c6b701314845cc.tar.bz2 emacs-da5707e8ec8df0a8a9bb1a1f12c6b701314845cc.zip | |
Fix --enable-gcc-warnings errors introduced in 2013-08-13 commit.
* image.c (imagemagick_filename_hint): Use `const char *' and
prefer SSDATA to SDATA to avoid warnings.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/image.c | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index af088340e3b..cf73204c55c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2013-08-14 Dmitry Antipov <dmantipov@yandex.ru> + Fix --enable-gcc-warnings errors introduced in 2013-08-13 commit. + * image.c (imagemagick_filename_hint): Use `const char *' and + prefer SSDATA to SDATA to avoid warnings. + +2013-08-14 Dmitry Antipov <dmantipov@yandex.ru> + Cleanup window fringes, margins and scroll bars adjustments. * window.c (set_window_fringes, set_window_margins) (set_window_scroll_bars, apply_window_adjustment): New functions. diff --git a/src/image.c b/src/image.c index e767d5447d1..99bb9d8c135 100644 --- a/src/image.c +++ b/src/image.c @@ -7851,9 +7851,9 @@ static char* imagemagick_filename_hint (Lisp_Object spec) { Lisp_Object format = image_spec_value (spec, intern (":format"), NULL); - Lisp_Object symbol = intern ("image-format-suffixes"); - Lisp_Object val; - char *name, *prefix = "/tmp/foo."; + Lisp_Object val, symbol = intern ("image-format-suffixes"); + const char *prefix = "/tmp/foo."; + char *name; if (NILP (Fboundp (symbol))) return NULL; @@ -7871,8 +7871,8 @@ imagemagick_filename_hint (Lisp_Object spec) return NULL; name = xmalloc (strlen (prefix) + SBYTES (val) + 1); - strcpy(name, prefix); - strcat(name, SDATA (val)); + strcpy (name, prefix); + strcat (name, SSDATA (val)); return name; } |