[Emacs-diffs] trunk r113863: Fix --enable-gcc-warnings errors introduced in 2013-08-13 commit.

[Dmitry Antipov]

------------------------------------------------------------
revno: 113863
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-08-14 08:27:32 +0400
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-14 04:09:37 +0000
+++ b/src/ChangeLog     2013-08-14 04:27:32 +0000
@@ -1,5 +1,11 @@
 2013-08-14  Dmitry Antipov  <address@hidden>
 
+       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  <address@hidden>
+
        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.

=== modified file 'src/image.c'
--- a/src/image.c       2013-08-13 20:13:02 +0000
+++ b/src/image.c       2013-08-14 04:27:32 +0000
@@ -7851,9 +7851,9 @@
 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 @@
     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;
 }