Date: Wed, 3 Mar 2010 06:41:01 +0000 (UTC) From: Edwin Groothuis <edwin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r204622 - user/edwin/ncal Message-ID: <201003030641.o236f1jN071282@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: edwin Date: Wed Mar 3 06:41:01 2010 New Revision: 204622 URL: http://svn.freebsd.org/changeset/base/204622 Log: Get rid of the old printyear[b] routines. Modified: user/edwin/ncal/Makefile user/edwin/ncal/ncal.c Modified: user/edwin/ncal/Makefile ============================================================================== --- user/edwin/ncal/Makefile Wed Mar 3 06:38:28 2010 (r204621) +++ user/edwin/ncal/Makefile Wed Mar 3 06:41:01 2010 (r204622) @@ -4,7 +4,7 @@ PROG= ncal DPADD= ${LIBCALENDAR} ${LIBTERMCAP} LDADD= -lcalendar -ltermcap -CFLAGS+= -I/usr/src/contrib/tzcode/libc/ +CFLAGS+= -Wall WARNS?= 1 #LINKS= ${BINDIR}/ncal ${BINDIR}/cal Modified: user/edwin/ncal/ncal.c ============================================================================== --- user/edwin/ncal/ncal.c Wed Mar 3 06:38:28 2010 (r204621) +++ user/edwin/ncal/ncal.c Wed Mar 3 06:41:01 2010 (r204622) @@ -175,8 +175,6 @@ void printcc(void); void printeaster(int year, int julian, int orthodox); void printmonth(int year, int month, int jd_flag); void printmonthb(int year, int month, int jd_flag); -void printyear(int year, int jd_flag); -void printyearb(int year, int jd_flag); int firstday(int y, int m); date *sdate(int ndays, struct date * d); date *sdateb(int ndays, struct date * d); @@ -551,7 +549,7 @@ monthrangeb(int y, int jd_flag, int m, i struct monthlines year[12]; struct weekdays wds; char s[80], t[80]; - wchar_t ws[80], wt[80]; + wchar_t ws[80]; char *wdss; int i, j; int mpl; @@ -718,135 +716,6 @@ monthrange(int y, int jd_flag, int m, in } void -printyear(int y, int jd_flag) -{ - struct monthlines year[12]; - struct weekdays wds; - char s[80], t[80]; - int i, j; - int mpl; - int mw; - - for (i = 0; i != 12; i++) - mkmonth(y, i, jd_flag, year + i); - mkweekdays(&wds); - mpl = jd_flag ? 3 : 4; - mw = jd_flag ? MONTH_WIDTH_J : MONTH_WIDTH; - - sprintf(s, "%d", y); - printf("%s\n", center(t, s, mpl * mw)); - -#define MW(mw, ms, ml) \ - strlen(ms) > (ml) ? (mw) + 9 : (mw) - - for (j = 0; j != 12; j += mpl) { - wprintf(L" %-*ls%-*ls", - mw, year[j].name, - mw, year[j + 1].name); - if (mpl == 3) - printf("%ls\n", year[j + 2].name); - else - wprintf(L"%-*ls%ls\n", - mw, year[j + 2].name, - year[j + 3].name); - for (i = 0; i != 7; i++) { - wprintf(L"%.2ls%-*s%-*s%-*s", - wds.names[i], - MW(mw, year[j].lines[i], year[j].linelen[i]), - year[j].lines[i], - MW(mw, year[j + 1].lines[i], - year[j + 1].linelen[i]), - year[j + 1].lines[i], - MW(mw, year[j + 2].lines[i], - year[j + 2].linelen[i]), - year[j + 2].lines[i]); - if (mpl == 4) - printf("%s", year[j + 3].lines[i]); - printf("\n"); - } - if (flag_weeks) { - if (mpl == 3) - printf(" %-*s%-*s%-s\n", - mw, year[j].weeks, - mw, year[j + 1].weeks, - year[j + 2].weeks); - else - printf(" %-*s%-*s%-*s%-s\n", - mw, year[j].weeks, - mw, year[j + 1].weeks, - mw, year[j + 2].weeks, - year[j + 3].weeks); - } - } -} - -void -printyearb(int y, int jd_flag) -{ - struct monthlines year[12]; - struct weekdays wds; - char s[80], t[80]; - wchar_t ws[80], wt[80]; - int i, j; - int mpl; - int mw; - - for (i = 0; i != 12; i++) - mkmonthb(y, i, jd_flag, year + i); - mkweekdays(&wds); - mpl = jd_flag ? 2 : 3; - mw = jd_flag ? MONTH_WIDTH_B_J : MONTH_WIDTH_B; - - sprintf(s, "%d", y); - printf("%s\n\n", center(t, s, mw * mpl + mpl)); - - for (j = 0; j != 12; j += mpl) { - wprintf(L"%-*ls ", mw, wcenter(ws, year[j].name, mw)); - if (mpl == 2) - printf("%ls\n", wcenter(ws, year[j + 1].name, mw)); - else - wprintf(L"%-*ls %ls\n", mw, - wcenter(ws, year[j + 1].name, mw), - wcenter(wt, year[j + 2].name, mw)); - - if (mpl == 2) - wprintf(L" %ls %ls %ls %ls %ls %ls %ls " - " %ls %ls %ls %ls %ls %ls %.2ls\n", - wds.names[6], wds.names[0], wds.names[1], - wds.names[2], wds.names[3], wds.names[4], - wds.names[5], - wds.names[6], wds.names[0], wds.names[1], - wds.names[2], wds.names[3], wds.names[4], - wds.names[5]); - else - wprintf(L"%ls%ls%ls%ls%ls%ls%ls " - "%ls%ls%ls%ls%ls%ls%ls " - "%ls%ls%ls%ls%ls%ls%.2ls\n", - wds.names[6], wds.names[0], wds.names[1], - wds.names[2], wds.names[3], wds.names[4], - wds.names[5], - wds.names[6], wds.names[0], wds.names[1], - wds.names[2], wds.names[3], wds.names[4], - wds.names[5], - wds.names[6], wds.names[0], wds.names[1], - wds.names[2], wds.names[3], wds.names[4], - wds.names[5]); - for (i = 0; i != 6; i++) { - if (mpl == 2) - printf("%-*s %s\n", - mw, year[j].lines[i]+1, - year[j + 1].lines[i]+1); - else - printf("%-*s %-*s %s\n", - mw, year[j].lines[i]+1, - mw, year[j + 1].lines[i]+1, - year[j + 2].lines[i]+1); - - } - } -} - -void mkmonth(int y, int m, int jd_flag, struct monthlines *mlines) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003030641.o236f1jN071282>