[Emacs-diffs] /srv/bzr/emacs/trunk r111939: * composite.c (get_composition_id, fill_gstring_header):

[Dmitry Antipov]

------------------------------------------------------------
revno: 111939
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2013-03-05 05:48:30 +0400
message:
  * composite.c (get_composition_id, fill_gstring_header):
  Use make_uninit_vector where appropriate.
  * font.c (Ffont_get_glyphs, build_style_table): Likewise.
  * xselect.c (clean_local_selection_data): Likewise.
modified:
  src/ChangeLog
  src/composite.c
  src/font.c
  src/xselect.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-03-04 17:35:29 +0000
+++ b/src/ChangeLog     2013-03-05 01:48:30 +0000
@@ -1,3 +1,10 @@
+2013-03-05  Dmitry Antipov  <address@hidden>
+
+       * composite.c (get_composition_id, fill_gstring_header):
+       Use make_uninit_vector where appropriate.
+       * font.c (Ffont_get_glyphs, build_style_table): Likewise.
+       * xselect.c (clean_local_selection_data): Likewise.
+
 2013-03-04  Paul Eggert  <address@hidden>
 
        Fix misuse of ImageMagick that caused core dump (Bug#13846).

=== modified file 'src/composite.c'
--- a/src/composite.c   2013-02-15 12:26:42 +0000
+++ b/src/composite.c   2013-03-05 01:48:30 +0000
@@ -234,7 +234,7 @@
     key = components;
   else if (NILP (components))
     {
-      key = Fmake_vector (make_number (nchars), Qnil);
+      key = make_uninit_vector (nchars);
       if (STRINGP (string))
        for (i = 0; i < nchars; i++)
          {
@@ -828,7 +828,7 @@
       if (len <= 8)
        header = AREF (gstring_work_headers, len - 1);
       else
-       header = Fmake_vector (make_number (len + 1), Qnil);
+       header = make_uninit_vector (len + 1);
     }
 
   ASET (header, 0, font_object);

=== modified file 'src/font.c'
--- a/src/font.c        2013-03-04 07:41:01 +0000
+++ b/src/font.c        2013-03-05 01:48:30 +0000
@@ -4705,7 +4705,7 @@
       chars = aref_addr (object, XFASTINT (from));
     }
 
-  vec = Fmake_vector (make_number (len), Qnil);
+  vec = make_uninit_vector (len);
   for (i = 0; i < len; i++)
     {
       Lisp_Object g;
@@ -4715,7 +4715,10 @@
 
       code = font->driver->encode_char (font, c);
       if (code == FONT_INVALID_CODE)
-       continue;
+       {
+         ASET (vec, i, Qnil);
+         continue;
+       }
       g = LGLYPH_NEW ();
       LGLYPH_SET_FROM (g, i);
       LGLYPH_SET_TO (g, i);
@@ -4898,7 +4901,7 @@
   int i, j;
   Lisp_Object table, elt;
 
-  table = Fmake_vector (make_number (nelement), Qnil);
+  table = make_uninit_vector (nelement);
   for (i = 0; i < nelement; i++)
     {
       for (j = 0; entry[i].names[j]; j++);

=== modified file 'src/xselect.c'
--- a/src/xselect.c     2013-02-08 05:28:52 +0000
+++ b/src/xselect.c     2013-03-05 01:48:30 +0000
@@ -1903,7 +1903,7 @@
       Lisp_Object copy;
       if (size == 1)
        return clean_local_selection_data (AREF (obj, 0));
-      copy = Fmake_vector (make_number (size), Qnil);
+      copy = make_uninit_vector (size);
       for (i = 0; i < size; i++)
        ASET (copy, i, clean_local_selection_data (AREF (obj, i)));
       return copy;