diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-09-04 16:58:01 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-09-04 16:58:01 -0700 |
| commit | 1c262cae409ec55a234c89b3b74a13a77c7f595a (patch) | |
| tree | 2780610d6227a3b1f64aa9398f21501ce3de774e /src/editfns.c | |
| parent | 7f59d9c856de33b97bc3f2708dcc8dadf24ee040 (diff) | |
| parent | 052bd38a56ad14a7f311677051e778de6c4bdc1c (diff) | |
| download | emacs-1c262cae409ec55a234c89b3b74a13a77c7f595a.tar.gz emacs-1c262cae409ec55a234c89b3b74a13a77c7f595a.tar.bz2 emacs-1c262cae409ec55a234c89b3b74a13a77c7f595a.zip | |
Merge from trunk.
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/editfns.c b/src/editfns.c index 6759016766f..580298c6e7d 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -2014,7 +2014,7 @@ the data it can't find. */) { int offset = tm_diff (t, &gmt); char *s = 0; - char buf[6]; + char buf[sizeof "+00" + INT_STRLEN_BOUND (int)]; #ifdef HAVE_TM_ZONE if (t->tm_zone) @@ -2029,7 +2029,8 @@ the data it can't find. */) if (!s) { /* No local time zone name is available; use "+-NNNN" instead. */ - int am = (offset < 0 ? -offset : offset) / 60; + int m = offset / 60; + int am = offset < 0 ? - m : m; sprintf (buf, "%c%02d%02d", (offset < 0 ? '-' : '+'), am/60, am%60); s = buf; } |