Date: Wed, 31 Mar 2010 06:37:44 +0000 (UTC) From: Edwin Groothuis <edwin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r205962 - user/edwin/calendar Message-ID: <201003310637.o2V6bi5J023006@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: edwin Date: Wed Mar 31 06:37:44 2010 New Revision: 205962 URL: http://svn.freebsd.org/changeset/base/205962 Log: Sync with freshly commited code. Modified: user/edwin/calendar/calendar.c user/edwin/calendar/calendar.h user/edwin/calendar/dates.c user/edwin/calendar/day.c user/edwin/calendar/events.c user/edwin/calendar/io.c user/edwin/calendar/locale.c user/edwin/calendar/parsedata.c user/edwin/calendar/pathnames.h user/edwin/calendar/pom.c user/edwin/calendar/sunpos.c Modified: user/edwin/calendar/calendar.c ============================================================================== --- user/edwin/calendar/calendar.c Wed Mar 31 05:23:35 2010 (r205961) +++ user/edwin/calendar/calendar.c Wed Mar 31 06:37:44 2010 (r205962) @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Modified: user/edwin/calendar/calendar.h ============================================================================== --- user/edwin/calendar/calendar.h Wed Mar 31 05:23:35 2010 (r205961) +++ user/edwin/calendar/calendar.h Wed Mar 31 06:37:44 2010 (r205962) @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Modified: user/edwin/calendar/dates.c ============================================================================== --- user/edwin/calendar/dates.c Wed Mar 31 05:23:35 2010 (r205961) +++ user/edwin/calendar/dates.c Wed Mar 31 06:37:44 2010 (r205962) @@ -1,5 +1,6 @@ /*- - * Copyright (c) 1992-2009 Edwin Groothuis. All rights reserved. + * Copyright (c) 1992-2009 Edwin Groothuis <edwin@FreeBSD.org>. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/edwin/calendar/day.c ============================================================================== --- user/edwin/calendar/day.c Wed Mar 31 05:23:35 2010 (r205961) +++ user/edwin/calendar/day.c Wed Mar 31 06:37:44 2010 (r205962) @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Modified: user/edwin/calendar/events.c ============================================================================== --- user/edwin/calendar/events.c Wed Mar 31 05:23:35 2010 (r205961) +++ user/edwin/calendar/events.c Wed Mar 31 06:37:44 2010 (r205962) @@ -1,5 +1,6 @@ /*- - * Copyright (c) 1992-2009 Edwin Groothuis. All rights reserved. + * Copyright (c) 1992-2009 Edwin Groothuis <edwin@FreeBSD.org>. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/edwin/calendar/io.c ============================================================================== --- user/edwin/calendar/io.c Wed Mar 31 05:23:35 2010 (r205961) +++ user/edwin/calendar/io.c Wed Mar 31 06:37:44 2010 (r205962) @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Modified: user/edwin/calendar/locale.c ============================================================================== --- user/edwin/calendar/locale.c Wed Mar 31 05:23:35 2010 (r205961) +++ user/edwin/calendar/locale.c Wed Mar 31 06:37:44 2010 (r205962) @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Modified: user/edwin/calendar/parsedata.c ============================================================================== --- user/edwin/calendar/parsedata.c Wed Mar 31 05:23:35 2010 (r205961) +++ user/edwin/calendar/parsedata.c Wed Mar 31 06:37:44 2010 (r205962) @@ -1,5 +1,6 @@ /*- - * Copyright (c) 1992-2009 Edwin Groothuis. All rights reserved. + * Copyright (c) 1992-2009 Edwin Groothuis <edwin@FreeBSD.org>. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -39,9 +40,9 @@ __FBSDID("$FreeBSD$"); static char *showflags(int flags); static int isonlydigits(char *s, int nostar); static const char *getmonthname(int i); -static int checkmonth(char *s, int *len, int *offset, const char **month); +static int checkmonth(char *s, size_t *len, size_t *offset, const char **month); static const char *getdayofweekname(int i); -static int checkdayofweek(char *s, int *len, int *offset, const char **dow); +static int checkdayofweek(char *s, size_t *len, size_t *offset, const char **dow); static int indextooffset(char *s); static int parseoffset(char *s); static char *floattoday(int year, double f); @@ -771,7 +772,7 @@ getmonthname(int i) } static int -checkmonth(char *s, int *len, int *offset, const char **month) +checkmonth(char *s, size_t *len, size_t *offset, const char **month) { struct fixs *n; int i; @@ -822,7 +823,7 @@ getdayofweekname(int i) } static int -checkdayofweek(char *s, int *len, int *offset, const char **dow) +checkdayofweek(char *s, size_t *len, size_t *offset, const char **dow) { struct fixs *n; int i; Modified: user/edwin/calendar/pathnames.h ============================================================================== --- user/edwin/calendar/pathnames.h Wed Mar 31 05:23:35 2010 (r205961) +++ user/edwin/calendar/pathnames.h Wed Mar 31 06:37:44 2010 (r205962) @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Modified: user/edwin/calendar/pom.c ============================================================================== --- user/edwin/calendar/pom.c Wed Mar 31 05:23:35 2010 (r205961) +++ user/edwin/calendar/pom.c Wed Mar 31 06:37:44 2010 (r205962) @@ -12,10 +12,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Modified: user/edwin/calendar/sunpos.c ============================================================================== --- user/edwin/calendar/sunpos.c Wed Mar 31 05:23:35 2010 (r205961) +++ user/edwin/calendar/sunpos.c Wed Mar 31 06:37:44 2010 (r205962) @@ -1,5 +1,6 @@ /*- - * Copyright (c) 2009-2010 Edwin Groothuis. All rights reserved. + * Copyright (c) 2009-2010 Edwin Groothuis <edwin@FreeBSD.org>. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003310637.o2V6bi5J023006>