[Emacs-diffs] /srv/bzr/emacs/trunk r110456: Avoid compiler warnings on w32, caused by cygw32 changes.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110456
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-08 13:19:35 +0200
message:
  Avoid compiler warnings on w32, caused by cygw32 changes.
  
   src/w32fns.c (w32_color_map_lookup, x_to_w32_color): Argument is now
   'const char *'.
   (x_to_w32_color): Don't modify the argument, modify a copy instead.
modified:
  src/ChangeLog
  src/w32fns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-08 10:26:10 +0000
+++ b/src/ChangeLog     2012-10-08 11:19:35 +0000
@@ -1,3 +1,9 @@
+2012-10-08  Eli Zaretskii  <address@hidden>
+
+       * w32fns.c (w32_color_map_lookup, x_to_w32_color): Argument is now
+       'const char *'.
+       (x_to_w32_color): Don't modify the argument, modify a copy instead.
+
 2012-10-08  Daniel Colascione  <address@hidden>
 
        * image.c: Permanent fix for JPEG compilation issue --- limit

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2012-10-08 11:03:00 +0000
+++ b/src/w32fns.c      2012-10-08 11:19:35 +0000
@@ -697,7 +697,7 @@
 }
 
 static Lisp_Object
-w32_color_map_lookup (char *colorname)
+w32_color_map_lookup (const char *colorname)
 {
   Lisp_Object tail, ret = Qnil;
 
@@ -776,7 +776,7 @@
 
 
 static Lisp_Object
-x_to_w32_color (char * colorname)
+x_to_w32_color (const char * colorname)
 {
   register Lisp_Object ret = Qnil;
 
@@ -785,11 +785,10 @@
   if (colorname[0] == '#')
     {
       /* Could be an old-style RGB Device specification.  */
-      char *color;
-      int size;
-      color = colorname + 1;
+      int size = strlen (colorname + 1);
+      char *color = alloca (size + 1);
 
-      size = strlen (color);
+      strcpy (color, colorname + 1);
       if (size == 3 || size == 6 || size == 9 || size == 12)
        {
          UINT colorval;
@@ -843,7 +842,7 @@
     }
   else if (strnicmp (colorname, "rgb:", 4) == 0)
     {
-      char *color;
+      const char *color;
       UINT colorval;
       int i, pos;
       pos = 0;
@@ -899,7 +898,7 @@
   else if (strnicmp (colorname, "rgbi:", 5) == 0)
     {
       /* This is an RGB Intensity specification.  */
-      char *color;
+      const char *color;
       UINT colorval;
       int i, pos;
       pos = 0;