[Emacs-diffs] /srv/bzr/emacs/trunk r104056: Don't abort in doprnt when passed unsupported %ll modifier.

[Eli Zaretskii]

------------------------------------------------------------
revno: 104056
fixes bug(s): http://debbugs.gnu.org/8545
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2011-04-29 22:34:06 +0300
message:
  Don't abort in doprnt when passed unsupported %ll modifier.
  
   src/doprnt.c (doprnt) [!HAVE_LONG_LONG_INT]: Error out instead of
   aborting when %lld or %lll format is passed.
   [!HAVE_UNSIGNED_LONG_LONG_INT]: Error out instead of aborting when
   %llo or %llx format is passed.  (Bug#8545)
modified:
  src/ChangeLog
  src/doprnt.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-04-29 18:03:00 +0000
+++ b/src/ChangeLog     2011-04-29 19:34:06 +0000
@@ -1,5 +1,10 @@
 2011-04-29  Eli Zaretskii  <address@hidden>
 
+       * doprnt.c (doprnt) [!HAVE_LONG_LONG_INT]: Error out instead of
+       aborting when %lld or %lll format is passed.
+       [!HAVE_UNSIGNED_LONG_LONG_INT]: Error out instead of aborting when
+       %llo or %llx format is passed.  (Bug#8545)
+
        * window.c (window_scroll_line_based): Use a marker instead of
        simple variables to record original value of point.  (Bug#7952)
 

=== modified file 'src/doprnt.c'
--- a/src/doprnt.c      2011-04-29 11:01:11 +0000
+++ b/src/doprnt.c      2011-04-29 19:34:06 +0000
@@ -269,7 +269,7 @@
                    long long ll = va_arg (ap, long long);
                    sprintf (sprintf_buffer, fmtcpy, ll);
 #else
-                   abort ();
+                   error ("Invalid format operation %%ll%c", fmt[-1]);
 #endif
                  }
                else if (long_flag)
@@ -299,7 +299,7 @@
                    unsigned long long ull = va_arg (ap, unsigned long long);
                    sprintf (sprintf_buffer, fmtcpy, ull);
 #else
-                   abort ();
+                   error ("Invalid format operation %%ll%c", fmt[-1]);
 #endif
                  }
                else if (long_flag)