[teklib-general] teklib: Util module: Changed DateToDMY() function definition
Timm S. Mueller
tmueller at neoscientists.org
Wed Jan 14 13:36:44 CET 2009
details: http://hg.teklib.org/teklib/rev/952ac202cdb9
changeset: 232:952ac202cdb9
user: Timm S. Mueller <tmueller at neoscientists.org>
date: Tue Jan 13 23:29:57 2009 +0100
description:
Util module: Changed DateToDMY() function definition
diffs (truncated from 273 to 100 lines):
diff -r 14287d3956c2 -r 952ac202cdb9 src/util/util_mod.h
--- a/src/util/util_mod.h Tue Jan 13 23:01:55 2009 +0100
+++ b/src/util/util_mod.h Tue Jan 13 23:29:57 2009 +0100
@@ -143,7 +143,7 @@
EXPORT TBOOL util_ydaytodm(struct TUtilBase *mod, TUINT n, TUINT y, TUINT *pd, TUINT *pm);
EXPORT TUINT util_dmytoyday(struct TUtilBase *mod, TUINT d, TUINT m, TUINT y);
EXPORT TUINT util_mytoday(struct TUtilBase *mod, TUINT m, TUINT y);
-EXPORT void util_datetodmy(struct TUtilBase *mod, TDATE *td, TUINT *pD, TUINT *pM, TUINT *pY, TUINT64 *pUS);
+EXPORT void util_datetodmy(struct TUtilBase *mod, TDATE *td, TUINT *pD, TUINT *pM, TUINT *pY, TTIME *pT);
EXPORT TUINT util_getweekday(struct TUtilBase *mod, TUINT d, TUINT m, TUINT y);
EXPORT TUINT util_getweeknumber(struct TUtilBase *mod, TUINT d, TUINT m, TUINT y);
EXPORT TBOOL util_packdate(struct TUtilBase *mod, struct TDateBox *db, TDATE *td);
diff -r 14287d3956c2 -r 952ac202cdb9 src/util/util_time.c
--- a/src/util/util_time.c Tue Jan 13 23:01:55 2009 +0100
+++ b/src/util/util_time.c Tue Jan 13 23:29:57 2009 +0100
@@ -1,4 +1,5 @@
+#include <tek/inline/util.h>
#include "util_mod.h"
static const TINT8 util_mdays[] =
@@ -10,7 +11,7 @@
** Check if year is a leap year
*/
-EXPORT TBOOL util_isleapyear(struct TUtilBase *mod, TUINT y)
+EXPORT TBOOL util_isleapyear(struct TUtilBase *TUtilBase, TUINT y)
{
if (y & 3) return TFALSE;
if (y < 1582) return TTRUE;
@@ -25,10 +26,11 @@
** Check if a date is valid
*/
-EXPORT TBOOL util_isvaliddate(struct TUtilBase *mod, TUINT d, TUINT m, TUINT y)
+EXPORT TBOOL util_isvaliddate(struct TUtilBase *TUtilBase, TUINT d, TUINT m,
+ TUINT y)
{
if (m == 2 && d == 29)
- return util_isleapyear(mod, y);
+ return TIsLeapYear(y);
return (m >= 1 && m <= 12 && d >= 1 && d <= util_mdays[m - 1]);
}
@@ -38,8 +40,8 @@
** Calculate a day and month from a yearday and year
*/
-EXPORT TBOOL util_ydaytodm(struct TUtilBase *mod, TUINT n, TUINT y, TUINT *pd,
- TUINT *pm)
+EXPORT TBOOL util_ydaytodm(struct TUtilBase *TUtilBase, TUINT n, TUINT y,
+ TUINT *pd, TUINT *pm)
{
TINT m;
TINT ndt = 0;
@@ -49,7 +51,7 @@
for (m = 1; m <= 12; ++m)
{
TINT md = util_mdays[m - 1];
- if (m == 2 && util_isleapyear(mod, y))
+ if (m == 2 && TIsLeapYear(y))
md++;
odt = ndt;
ndt += md;
@@ -69,10 +71,11 @@
** Calculate the yearday from a date
*/
-EXPORT TUINT util_dmytoyday(struct TUtilBase *mod, TUINT d, TUINT m, TUINT y)
+EXPORT TUINT util_dmytoyday(struct TUtilBase *TUtilBase, TUINT d, TUINT m,
+ TUINT y)
{
TINT k, n;
- k = 2 - util_isleapyear(mod, y);
+ k = 2 - TIsLeapYear(y);
k *= (m + 9) / 12;
n = 275 * m / 9;
n += d - 30 - k;
@@ -85,7 +88,7 @@
** Convert month and year to days since 1.1.1601
*/
-EXPORT TUINT util_mytoday(struct TUtilBase *mod, TUINT m, TUINT y)
+EXPORT TUINT util_mytoday(struct TUtilBase *TUtilBase, TUINT m, TUINT y)
{
TINT a = (14 - m) / 12;
TINT d;
@@ -102,11 +105,11 @@
/*****************************************************************************/
/*
-** util_datetodmy(date, pD, pM, pY, pUS)
+** util_datetodmy(date, pD, pM, pY, pT)
*/
-EXPORT void util_datetodmy(struct TUtilBase *mod, TDATE *td, TUINT *pD,
- TUINT *pM, TUINT *pY, TUINT64 *pUS)
+EXPORT void util_datetodmy(struct TUtilBase *TUtilBase, TDATE *td, TUINT *pD,
+ TUINT *pM, TUINT *pY, TTIME *pT)
{
More information about the teklib-general
mailing list