Mercurial > hg > xemacs-beta
diff src/strftime.c @ 5016:2ade80e8c640
enable more warnings and fix them
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* configure:
* configure.ac (TAB):
Various warnings that used to be present had mistakenly gotten
turned off. Turn them back on.
lwlib/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* xt-wrappers.h:
* xt-wrappers.h (Xt_SET_VALUE):
* xt-wrappers.h (Xt_GET_VALUE):
Rename var to avoid shadowing problems.
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* alloc.c:
Add prototypes for debugging functions.
* alloc.c (compact_string_chars): Make static.
* console-x.c (x_initially_selected_for_input):
* console-x.h:
* console-x.h (X_ERROR_OCCURRED):
Delete x_has_keysym() prototype from console-x.c, move to console-x.h.
* eval.c (multiple_value_call):
Real bug: Fix shadowing local vars.
* event-unixoid.c (read_event_from_tty_or_stream_desc):
* event-unixoid.c (signal_fake_event):
* lread.c (check_if_suppressed):
* strftime.c (strftime):
Fix stupid global shadowing warnings.
* event-unixoid.c (signal_fake_event):
* event-unixoid.c (drain_signal_event_pipe):
Use Rawbyte, not char.
* frame.h: Remove old prototype.
* gc.c:
* gc.c (show_gc_cursor_and_message):
* gc.c (remove_gc_cursor_and_message):
* gc.c (gc_prepare):
* gc.c (gc_finish_mark):
* gc.c (gc_finalize):
* gc.c (gc_sweep):
* gc.c (gc_finish):
* gc.c (gc_suspend_mark_phase):
* gc.c (gc_resume_mark_phase):
* gc.c (gc_mark):
* gc.c (gc_resume_mark):
Make fns static.
* glyphs-eimage.c (gif_decode_error_string):
Fix non-prototype.
* lisp.h:
Hack around global shadowing warnings involving `index'.
* intl-win32.c (wcsncpy):
* number-gmp.c (bigfloat_to_string):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
* specifier.c (call_charset_predicate):
* specifier.c (DEFINE_SPECIFIER_TAG_FROB):
Declarations cannot follow statements in standard C.
* search.c (search_buffer): Fix local shadowing warnings.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 08 Feb 2010 21:28:57 -0600 |
| parents | 0a63e5de7bdc |
| children | 1537701f08a1 |
line wrap: on
line diff
--- a/src/strftime.c Mon Feb 08 16:51:25 2010 -0600 +++ b/src/strftime.c Mon Feb 08 21:28:57 2010 -0600 @@ -396,13 +396,13 @@ case 'G': { int year = tm->tm_year + 1900; - int days = iso_week_days (tm->tm_yday, tm->tm_wday); + int ndays = iso_week_days (tm->tm_yday, tm->tm_wday); - if (days < 0) + if (ndays < 0) { /* This ISO week belongs to the previous year. */ year--; - days = + ndays = iso_week_days (tm->tm_yday + (365 + __isleap (year)), tm->tm_wday); } @@ -415,7 +415,7 @@ { /* This ISO week belongs to the next year. */ year++; - days = d; + ndays = d; } } @@ -442,7 +442,7 @@ default: length += - add_num2 (&string[length], days / 7 + 1, + add_num2 (&string[length], ndays / 7 + 1, max - length, pad); break; } @@ -474,7 +474,7 @@ /* tm diff code below is based on mktime.c, glibc 2.3.2 */ { int lt4, ut4, lt100, ut100, lt400, ut400; - int intervening_leap_days, years, days; + int intervening_leap_days, years, ndays; lt4 = (lt.tm_year >> 2) + (1900 >> 2) - ! (lt.tm_year & 3); @@ -487,9 +487,10 @@ intervening_leap_days = (lt4 - ut4) - (lt100 - ut100) + (lt400 - ut400); years = lt.tm_year - ut->tm_year; - days = (365 * years + intervening_leap_days + ndays = (365 * years + intervening_leap_days + (lt.tm_yday - ut->tm_yday)); - offset = (60 * (60 * (24 * days + (lt.tm_hour - ut->tm_hour)) + offset = (60 * (60 * (24 * ndays + + (lt.tm_hour - ut->tm_hour)) + (lt.tm_min - ut->tm_min)) + (lt.tm_sec - ut->tm_sec)); }