[Emacs-diffs] /srv/bzr/emacs/trunk r108972: Minor improvements to make_formatted_string.

[Paul Eggert]

------------------------------------------------------------
revno: 108972
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2012-07-09 09:06:19 -0700
message:
  Minor improvements to make_formatted_string.
  
  * alloc.c (make_formatted_string): Prefer int to ptrdiff_t
  where int is good enough, as vsprintf returns an int.
  * lisp.h (make_formatted_string): Add ATTRIBUTE_FORMAT_PRINTF.
modified:
  src/ChangeLog
  src/alloc.c
  src/lisp.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-09 12:02:27 +0000
+++ b/src/ChangeLog     2012-07-09 16:06:19 +0000
@@ -1,3 +1,10 @@
+2012-07-09  Paul Eggert  <address@hidden>
+
+       Minor improvements to make_formatted_string.
+       * alloc.c (make_formatted_string): Prefer int to ptrdiff_t
+       where int is good enough, as vsprintf returns an int.
+       * lisp.h (make_formatted_string): Add ATTRIBUTE_FORMAT_PRINTF.
+
 2012-07-09  Dmitry Antipov  <address@hidden>
 
        Use make_formatted_string to avoid double length calculation.

=== modified file 'src/alloc.c'
--- a/src/alloc.c       2012-07-09 12:02:27 +0000
+++ b/src/alloc.c       2012-07-09 16:06:19 +0000
@@ -2524,7 +2524,7 @@
 make_formatted_string (char *buf, const char *format, ...)
 {
   va_list ap;
-  ptrdiff_t length;
+  int length;
 
   va_start (ap, format);
   length = vsprintf (buf, format, ap);

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2012-07-09 12:02:27 +0000
+++ b/src/lisp.h        2012-07-09 16:06:19 +0000
@@ -2611,7 +2611,8 @@
 extern Lisp_Object allocate_misc (void);
 extern _Noreturn void string_overflow (void);
 extern Lisp_Object make_string (const char *, ptrdiff_t);
-extern Lisp_Object make_formatted_string (char *, const char *, ...);
+extern Lisp_Object make_formatted_string (char *, const char *, ...)
+  ATTRIBUTE_FORMAT_PRINTF (2, 3);
 extern Lisp_Object make_unibyte_string (const char *, ptrdiff_t);
 extern Lisp_Object make_multibyte_string (const char *, ptrdiff_t, ptrdiff_t);
 extern Lisp_Object make_event_array (int, Lisp_Object *);