[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108728: * xterm.c (x_term_init): Build proper-sized _XSETTINGS_Snnn string

[Paul Eggert]

------------------------------------------------------------
revno: 108728
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2012-06-24 16:14:39 -0700
message:
  * xterm.c (x_term_init): Build proper-sized _XSETTINGS_Snnn string
  
  instead of truncating it to 63 (admittedly a generous limit).
modified:
  src/ChangeLog
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-24 20:34:48 +0000
+++ b/src/ChangeLog     2012-06-24 23:14:39 +0000
@@ -1,5 +1,8 @@
 2012-06-24  Paul Eggert  <address@hidden>
 
+       * xterm.c (x_term_init): Build proper-sized _XSETTINGS_Snnn string
+       instead of truncating it to 63 (admittedly a generous limit).
+
        * process.c: Fix spelling and caps in comments.
 
 2012-06-24  Dan Nicolaescu  <address@hidden>

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2012-06-24 17:39:14 +0000
+++ b/src/xterm.c       2012-06-24 23:14:39 +0000
@@ -10375,14 +10375,16 @@
     const int total_atom_count = 1 + atom_count;
     Atom *atoms_return = xmalloc (sizeof (Atom) * total_atom_count);
     char **atom_names = xmalloc (sizeof (char *) * total_atom_count);
-    char xsettings_atom_name[64];
+    static char const xsettings_fmt[] = "_XSETTINGS_S%d";
+    char xsettings_atom_name[sizeof xsettings_fmt - 2
+                            + INT_STRLEN_BOUND (int)];
 
     for (i = 0; i < atom_count; i++)
       atom_names[i] = (char *) atom_refs[i].name;
 
     /* Build _XSETTINGS_SN atom name */
-    snprintf (xsettings_atom_name, sizeof (xsettings_atom_name),
-              "_XSETTINGS_S%d", XScreenNumberOfScreen (dpyinfo->screen));
+    sprintf (xsettings_atom_name, xsettings_fmt,
+            XScreenNumberOfScreen (dpyinfo->screen));
     atom_names[i] = xsettings_atom_name;
 
     XInternAtoms (dpyinfo->display, atom_names, total_atom_count,