[Emacs-diffs] /srv/bzr/emacs/trunk r99391: Make string pointer args point to const as in other string allocation functions.

[YAMAMOTO Mitsuharu]

------------------------------------------------------------
revno: 99391
committer: YAMAMOTO Mitsuharu <address@hidden>
branch nick: trunk
timestamp: Fri 2010-01-22 18:10:04 +0900
message:
  Make string pointer args point to const as in other string allocation 
functions.
  
  * lisp.h (make_pure_string): String pointer arg now points to const.
  
  * alloc.c (find_string_data_in_pure, make_pure_string): String pointer
  args now point to const.
modified:
  src/ChangeLog
  src/alloc.c
  src/lisp.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-01-22 08:44:50 +0000
+++ b/src/ChangeLog     2010-01-22 09:10:04 +0000
@@ -1,3 +1,10 @@
+2010-01-22  YAMAMOTO Mitsuharu  <address@hidden>
+
+       * lisp.h (make_pure_string): String pointer arg now points to const.
+
+       * alloc.c (find_string_data_in_pure, make_pure_string): String pointer
+       args now point to const.
+
 2010-01-22  Eli Zaretskii  <address@hidden>
 
        * lread.c (Fload): Don't treat files without .elc extension as

=== modified file 'src/alloc.c'
--- a/src/alloc.c       2010-01-13 08:35:10 +0000
+++ b/src/alloc.c       2010-01-22 09:10:04 +0000
@@ -4725,11 +4725,11 @@
 
 static char *
 find_string_data_in_pure (data, nbytes)
-     char *data;
+     const char *data;
      int nbytes;
 {
   int i, skip, bm_skip[256], last_char_skip, infinity, start, start_max;
-  unsigned char *p;
+  const unsigned char *p;
   char *non_lisp_beg;
 
   if (pure_bytes_used_non_lisp < nbytes + 1)
@@ -4740,7 +4740,7 @@
   for (i = 0; i < 256; i++)
     bm_skip[i] = skip;
 
-  p = (unsigned char *) data;
+  p = (const unsigned char *) data;
   while (--skip > 0)
     bm_skip[*p++] = skip;
 
@@ -4754,7 +4754,7 @@
   infinity = pure_bytes_used_non_lisp + 1;
   bm_skip['\0'] = infinity;
 
-  p = (unsigned char *) non_lisp_beg + nbytes;
+  p = (const unsigned char *) non_lisp_beg + nbytes;
   start = 0;
   do
     {
@@ -4796,7 +4796,7 @@
 
 Lisp_Object
 make_pure_string (data, nchars, nbytes, multibyte)
-     char *data;
+     const char *data;
      int nchars, nbytes;
      int multibyte;
 {

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2010-01-13 08:35:10 +0000
+++ b/src/lisp.h        2010-01-22 09:10:04 +0000
@@ -2686,7 +2686,7 @@
 extern Lisp_Object make_string_from_bytes P_ ((const char *, int, int));
 extern Lisp_Object make_specified_string P_ ((const char *, int, int, int));
 EXFUN (Fpurecopy, 1);
-extern Lisp_Object make_pure_string P_ ((char *, int, int, int));
+extern Lisp_Object make_pure_string P_ ((const char *, int, int, int));
 extern Lisp_Object make_pure_c_string (const char *data);
 extern Lisp_Object pure_cons P_ ((Lisp_Object, Lisp_Object));
 extern Lisp_Object make_pure_vector P_ ((EMACS_INT));