head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.160 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.158 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.156 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.154 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.152 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.150 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.148 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.146 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.144 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.142 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.140 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.138 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.136 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.134 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.132 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.130 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.128 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.126 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.124 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.122 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.120 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.118 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.116 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.112 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.92 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.114 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.110 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.108 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.106 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.104 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.102 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.100 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.98 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.96 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.94 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.90 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.88 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.86 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.84 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.82 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.80 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.78 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.76 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.74 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.72 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.70 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.68 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.66 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.64 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.62 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.60 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.58 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.56 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.54 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.52 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.50 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.48 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.46 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.44 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.42 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.40 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.38 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.36 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.34 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.32 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.30 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.28 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.26 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.24 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.22 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.20 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.18 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.16 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.14 pkgsrc-2008Q1:1.2.0.12 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.10 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.8 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.6 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.4 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.2 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.1.0.32 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.30 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.28 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.26 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.24 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.22 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.20 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.18 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.16 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2-base:1.1 buildlink2:1.1.0.2; locks; strict; comment @# @; 1.2 date 2006.11.28.23.04.55; author agc; state Exp; branches; next 1.1; 1.1 date 2002.06.15.20.40.26; author dmcmahill; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2002.06.15.20.40.26; author jlam; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2002.06.23.19.03.01; author jlam; state Exp; branches; next ; desc @@ 1.2 log @Quieten some more warnings which gcc4 gripes about @ text @$NetBSD: patch-ab,v 1.1 2002/06/15 20:40:26 dmcmahill Exp $ the time stuff is needed to compile on alpha, the other stuff kills compiler warnings --- MultiClock.c.orig Sat Jun 15 16:09:44 2002 +++ MultiClock.c @@@@ -33,9 +33,10 @@@@ #include #include "MultiClockP.h" -extern long time(); +#include +#include static void clock_tic(), updateClocks(), DrawHand(), DrawSecond(), SetSeg(), DrawClockFace(); -static erase_hands(), round(); +static erase_hands(), xchrono_round(); /* Private Definitions */ @@@@ -177,7 +178,7 @@@@ { ClassField(numberOfSlots) += CLOCK_LIST_SIZE; ClassField(clockList) = - (ClockWidget *) XtRealloc(ClassField(clockList), + (ClockWidget *) XtRealloc((void *) ClassField(clockList), sizeof(ClockWidget)*ClassField(numberOfSlots)); } @@@@ -239,7 +240,7 @@@@ if(!w->clock.analog) { char *str; struct tm tm, *localtime(); - long time_value; + time_t time_value; (void) time(&time_value); tm = *localtime(&time_value); str = asctime(&tm); @@@@ -391,7 +392,7 @@@@ XtIntervalId *id; { ClockWidget w = (ClockWidget) client_data; - long time_value; + time_t time_value; char localTimezone[TZ_BUFLEN]; char *tzenv = getenv("TZ"); struct tm *localtime(); @@@@ -417,11 +418,11 @@@@ { (*list)->clock.show_second_hand = (ClassField(updateInterval) <= SECOND_HAND_TIME); - if (XtIsRealized(*list)) + if (XtIsRealized((Widget) *list)) { if ((*list)->clock.timezone) { - sprintf (tzEnviron, "TZ=%s", (*list)->clock.timezone); + snprintf (tzEnviron, sizeof(tzEnviron), "TZ=%s", (*list)->clock.timezone); putenv (tzEnviron); tzset (); } @@@@ -433,7 +434,7 @@@@ if (tzenv) { - sprintf (tzEnviron, "TZ=%s", localTimezone); + snprintf (tzEnviron, sizeof(tzEnviron), "TZ=%s", localTimezone); putenv (tzEnviron); } #ifndef SYSV @@@@ -525,7 +526,7 @@@@ } else am_pm = "AM"; - sprintf (time_string, "%d/%d", tm.tm_mon+1, tm.tm_mday); + snprintf (time_string, sizeof(time_string), "%d/%d", tm.tm_mon+1, tm.tm_mday); { int len = strlen (time_string); int x = w->core.width - @@@@ -760,14 +761,14 @@@@ wc = width * cosangle; ws = width * sinangle; SetSeg(w, - x = w->clock.centerX + round(length * sinangle), - y = w->clock.centerY - round(length * cosangle), - x1 = w->clock.centerX - round(ws + wc), - y1 = w->clock.centerY + round(wc - ws)); /* 1 ---- 2 */ + x = w->clock.centerX + xchrono_round(length * sinangle), + y = w->clock.centerY - xchrono_round(length * cosangle), + x1 = w->clock.centerX - xchrono_round(ws + wc), + y1 = w->clock.centerY + xchrono_round(wc - ws)); /* 1 ---- 2 */ /* 2 */ SetSeg(w, x1, y1, - x2 = w->clock.centerX - round(ws - wc), - y2 = w->clock.centerY + round(wc + ws)); /* 2 ----- 3 */ + x2 = w->clock.centerX - xchrono_round(ws - wc), + y2 = w->clock.centerY + xchrono_round(wc + ws)); /* 2 ----- 3 */ SetSeg(w, x2, y2, x, y); /* 3 ----- 1(4) */ } @@@@ -834,14 +835,14 @@@@ ws = width * sinangle; /*1 ---- 2 */ SetSeg(w, - x = w->clock.centerX + round(length * sinangle), - y = w->clock.centerY - round(length * cosangle), - w->clock.centerX + round(ms - wc), - w->clock.centerY - round(mc + ws) ); - SetSeg(w, w->clock.centerX + round(offset *sinangle), - w->clock.centerY - round(offset * cosangle), /* 2-----3 */ - w->clock.centerX + round(ms + wc), - w->clock.centerY - round(mc - ws)); + x = w->clock.centerX + xchrono_round(length * sinangle), + y = w->clock.centerY - xchrono_round(length * cosangle), + w->clock.centerX + xchrono_round(ms - wc), + w->clock.centerY - xchrono_round(mc + ws) ); + SetSeg(w, w->clock.centerX + xchrono_round(offset *sinangle), + w->clock.centerY - xchrono_round(offset * cosangle), /* 2-----3 */ + w->clock.centerX + xchrono_round(ms + wc), + w->clock.centerY - xchrono_round(mc - ws)); w->clock.segbuffptr->x = x; w->clock.segbuffptr++->y = y; w->clock.numseg ++; @@@@ -886,7 +887,7 @@@@ w->clock.numseg = 0; } -static int round(x) +static int xchrono_round(x) double x; { return(x >= 0.0 ? (int)(x + .5) : (int)(x - .5)); @ 1.1 log @make this go on alpha @ text @d1 1 a1 1 $NetBSD$ d8 1 a8 1 @@@@ -33,7 +33,7 @@@@ d13 1 d16 2 a17 1 static erase_hands(), round(); d19 3 a21 1 @@@@ -177,7 +177,7 @@@@ d30 1 a30 1 @@@@ -239,7 +239,7 @@@@ d39 1 a39 1 @@@@ -391,7 +391,7 @@@@ d48 1 a48 1 @@@@ -417,7 +417,7 @@@@ d57 76 @ 1.1.2.1 log @file patch-ab was added on branch buildlink2 on 2002-06-23 19:03:01 +0000 @ text @d1 52 @ 1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 52 $NetBSD: patch-ab,v 1.1.2.1 2002/06/23 19:03:01 jlam Exp $ the time stuff is needed to compile on alpha, the other stuff kills compiler warnings --- MultiClock.c.orig Sat Jun 15 16:09:44 2002 +++ MultiClock.c @@@@ -33,7 +33,7 @@@@ #include #include "MultiClockP.h" -extern long time(); +#include static void clock_tic(), updateClocks(), DrawHand(), DrawSecond(), SetSeg(), DrawClockFace(); static erase_hands(), round(); @@@@ -177,7 +177,7 @@@@ { ClassField(numberOfSlots) += CLOCK_LIST_SIZE; ClassField(clockList) = - (ClockWidget *) XtRealloc(ClassField(clockList), + (ClockWidget *) XtRealloc((void *) ClassField(clockList), sizeof(ClockWidget)*ClassField(numberOfSlots)); } @@@@ -239,7 +239,7 @@@@ if(!w->clock.analog) { char *str; struct tm tm, *localtime(); - long time_value; + time_t time_value; (void) time(&time_value); tm = *localtime(&time_value); str = asctime(&tm); @@@@ -391,7 +391,7 @@@@ XtIntervalId *id; { ClockWidget w = (ClockWidget) client_data; - long time_value; + time_t time_value; char localTimezone[TZ_BUFLEN]; char *tzenv = getenv("TZ"); struct tm *localtime(); @@@@ -417,7 +417,7 @@@@ { (*list)->clock.show_second_hand = (ClassField(updateInterval) <= SECOND_HAND_TIME); - if (XtIsRealized(*list)) + if (XtIsRealized((Widget) *list)) { if ((*list)->clock.timezone) { @