diff --git a/qse/Makefile.in b/qse/Makefile.in index 127cb8e0..83d14b98 100644 --- a/qse/Makefile.in +++ b/qse/Makefile.in @@ -80,12 +80,12 @@ host_triplet = @host@ subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/README.in ac/ar-lib ac/compile ac/config.guess \ - ac/config.sub ac/depcomp ac/install-sh ac/missing ac/ltmain.sh \ - $(top_srcdir)/ac/ar-lib $(top_srcdir)/ac/compile \ - $(top_srcdir)/ac/config.guess $(top_srcdir)/ac/config.sub \ - $(top_srcdir)/ac/install-sh $(top_srcdir)/ac/ltmain.sh \ - $(top_srcdir)/ac/missing + $(srcdir)/README.in README ac/ar-lib ac/compile \ + ac/config.guess ac/config.sub ac/depcomp ac/install-sh \ + ac/missing ac/ltmain.sh $(top_srcdir)/ac/ar-lib \ + $(top_srcdir)/ac/compile $(top_srcdir)/ac/config.guess \ + $(top_srcdir)/ac/config.sub $(top_srcdir)/ac/install-sh \ + $(top_srcdir)/ac/ltmain.sh $(top_srcdir)/ac/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ $(top_srcdir)/m4/ax_check_sign.m4 \ diff --git a/qse/include/qse/cmn/tmr.h b/qse/include/qse/cmn/tmr.h index 258bf0be..95718140 100644 --- a/qse/include/qse/cmn/tmr.h +++ b/qse/include/qse/cmn/tmr.h @@ -117,7 +117,7 @@ QSE_EXPORT qse_tmr_index_t qse_tmr_insert ( const qse_tmr_event_t* event ); -QSE_EXPORT qse_size_t qse_tmr_update ( +QSE_EXPORT qse_tmr_index_t qse_tmr_update ( qse_tmr_t* tmr, qse_tmr_index_t index, const qse_tmr_event_t* event diff --git a/qse/lib/cmn/time.c b/qse/lib/cmn/time.c index 950fae17..0db39232 100644 --- a/qse/lib/cmn/time.c +++ b/qse/lib/cmn/time.c @@ -306,17 +306,17 @@ static void breakdown_time (const qse_ntime_t* nt, qse_btime_t* bt, qse_long_t o { while (days >= QSE_DAYS_PER_YEAR(year)) { - days -= QSE_DAYS_PER_YEAR(year); - year++; - } + days -= QSE_DAYS_PER_YEAR(year); + year++; } - else + } + else { do { - year--; - days += QSE_DAYS_PER_YEAR(year); - } + year--; + days += QSE_DAYS_PER_YEAR(year); + } while (days < 0); } @@ -492,7 +492,7 @@ int qse_timegm (const qse_btime_t* bt, qse_ntime_t* nt) *nt = n + bt->msec;*/ nt->sec = n; - nt->nsec = 0; + nt->nsec = 0; } return 0; diff --git a/qse/lib/cmn/tmr.c b/qse/lib/cmn/tmr.c index 38c09a80..68e839fc 100644 --- a/qse/lib/cmn/tmr.c +++ b/qse/lib/cmn/tmr.c @@ -219,7 +219,7 @@ qse_tmr_index_t qse_tmr_insert (qse_tmr_t* tmr, const qse_tmr_event_t* event) return sift_up (tmr, index, 0); } -qse_size_t qse_tmr_update (qse_tmr_t* tmr, qse_size_t index, const qse_tmr_event_t* event) +qse_tmr_index_t qse_tmr_update (qse_tmr_t* tmr, qse_size_t index, const qse_tmr_event_t* event) { qse_tmr_event_t item; diff --git a/qse/lib/http/httpd-proxy.c b/qse/lib/http/httpd-proxy.c index eab70071..fc918903 100644 --- a/qse/lib/http/httpd-proxy.c +++ b/qse/lib/http/httpd-proxy.c @@ -944,8 +944,7 @@ static void adjust_peer_name_and_port (task_proxy_t* proxy) } } -static int task_init_proxy ( - qse_httpd_t* httpd, qse_httpd_client_t* client, qse_httpd_task_t* task) +static int task_init_proxy (qse_httpd_t* httpd, qse_httpd_client_t* client, qse_httpd_task_t* task) { task_proxy_t* proxy; task_proxy_arg_t* arg;