From owner-svn-src-user@FreeBSD.ORG Thu Mar 4 06:36:49 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 057841065679; Thu, 4 Mar 2010 06:36:49 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EA09F8FC12; Thu, 4 Mar 2010 06:36:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o246am7G093357; Thu, 4 Mar 2010 06:36:48 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o246amm7093355; Thu, 4 Mar 2010 06:36:48 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201003040636.o246amm7093355@svn.freebsd.org> From: Edwin Groothuis Date: Thu, 4 Mar 2010 06:36:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204693 - user/edwin/ncal X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Mar 2010 06:36:49 -0000 Author: edwin Date: Thu Mar 4 06:36:48 2010 New Revision: 204693 URL: http://svn.freebsd.org/changeset/base/204693 Log: Replace random constant line lengths with #define constants. Modified: user/edwin/ncal/ncal.c Modified: user/edwin/ncal/ncal.c ============================================================================== --- user/edwin/ncal/ncal.c Thu Mar 4 06:36:00 2010 (r204692) +++ user/edwin/ncal/ncal.c Thu Mar 4 06:36:48 2010 (r204693) @@ -444,7 +444,7 @@ printeaster(int y, int julian, int ortho { date dt; struct tm tm; - char buf[80]; + char buf[MAX_WIDTH]; static int d_first = -1; if (d_first < 0) @@ -489,8 +489,8 @@ 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], ws1[80]; + char s[MAX_WIDTH], t[MAX_WIDTH]; + wchar_t ws[MAX_WIDTH], ws1[MAX_WIDTH]; const char *wdss; int i, j; int mpl; @@ -576,7 +576,7 @@ monthranger(int y, int jd_flag, int m, i { struct monthlines year[12]; struct weekdays wds; - char s[80], t[80]; + char s[MAX_WIDTH], t[MAX_WIDTH]; int i, j; int mpl; int mw; @@ -981,7 +981,7 @@ sdateb(int nd, struct date *d) char * center(char *s, char *t, int w) { - char blanks[80]; + char blanks[MAX_WIDTH]; memset(blanks, ' ', sizeof(blanks)); sprintf(s, "%.*s%s", (int)(w - strlen(t)) / 2, blanks, t); @@ -992,7 +992,7 @@ center(char *s, char *t, int w) wchar_t * wcenter(wchar_t *s, wchar_t *t, int w) { - char blanks[80]; + char blanks[MAX_WIDTH]; memset(blanks, ' ', sizeof(blanks)); swprintf(s, MAX_WIDTH, L"%.*s%ls", (int)(w - wcslen(t)) / 2, blanks, t);