Changeset: 6f9e58bcfd11 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6f9e58bcfd11
Modified Files:
monetdb5/mal/mal_parser.c
monetdb5/modules/atoms/mtime.c
Branch: headless
Log Message:
More static functions.
diffs (truncated from 417 to 300 lines):
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -733,7 +733,7 @@
*
* An atom statement does not introduce a new module.
*/
-void
+static void
helpInfo(Client cntxt, str *help)
{
int l;
@@ -753,7 +753,7 @@
skipToEnd(cntxt);
}
-void
+static void
propList(Client cntxt, int arg)
{
MalBlkPtr curBlk= cntxt->curprg->def;
@@ -798,7 +798,7 @@
}
}
-InstrPtr
+static InstrPtr
binding(Client cntxt, MalBlkPtr curBlk, InstrPtr curInstr, int flag)
{
int l, varid;
@@ -1077,7 +1077,7 @@
* Note, the function name could be mod.fcn, which calls for storing
* the function definition in a particular module instead of the current one.
*/
-MalBlkPtr
+static MalBlkPtr
fcnHeader(Client cntxt,int kind)
{
int l;
diff --git a/monetdb5/modules/atoms/mtime.c b/monetdb5/modules/atoms/mtime.c
--- a/monetdb5/modules/atoms/mtime.c
+++ b/monetdb5/modules/atoms/mtime.c
@@ -1494,7 +1494,7 @@
return ret;
}
-inline int
+static inline int
daytime_add(daytime *ret, daytime *v, lng *msec)
{
if (*v == daytime_nil) {
@@ -1506,7 +1506,7 @@
}
/* extracts daytime from timestamp */
-inline int
+static inline int
timestamp_extract_daytime(daytime *ret, timestamp *t, tzone *z)
{
if (ts_isnil(*t) || tz_isnil(*z)) {
@@ -1528,14 +1528,14 @@
return GDK_SUCCEED;
}
-inline int
+static inline int
timestamp_extract_daytime_default(daytime *ret, timestamp *t)
{
return timestamp_extract_daytime(ret, t, &tzone_local);
}
/* extracts date from timestamp */
-inline int
+static inline int
timestamp_extract_date(date *ret, timestamp *t, tzone *z)
{
if (ts_isnil(*t) || tz_isnil(*z)) {
@@ -1557,7 +1557,7 @@
return GDK_SUCCEED;
}
-inline int
+static inline int
timestamp_extract_date_default(date *ret, timestamp *t)
{
return timestamp_extract_date(ret, t, &tzone_local);
@@ -1566,7 +1566,7 @@
inline int date_adddays(date *ret, date *v, int *delta);
/* returns the date that comes a number of years after 'v' (or before iff
*delta < 0). */
-inline int
+static inline int
date_addyears(date *ret, date *v, int *delta)
{
if (*v == date_nil || *delta == int_nil) {
@@ -1596,7 +1596,7 @@
}
/* returns the date that comes a number of months after 'v' (or before iff
*delta < 0). */
-inline int
+static inline int
date_addmonths(date *ret, date *v, int *delta)
{
if (*v == date_nil || *delta == int_nil) {
@@ -1643,7 +1643,7 @@
/* returns the number of days between 'val1' and 'val2'. */
-inline int
+static inline int
date_diff(int *ret, date *v1, date *v2)
{
if (*v1 == date_nil || *v2 == date_nil) {
@@ -1697,7 +1697,7 @@
/* return whether DST holds in the tzone at a certain point of time. */
-inline int
+static inline int
timestamp_inside_dst(bit *ret, timestamp *p, tzone *z)
{
*ret = FALSE;
@@ -1715,7 +1715,7 @@
}
/* create a DST start/end date rule. */
-inline int
+static inline int
rule_create(rule *ret, int *month, int *day, int *weekday, int *minutes)
{
ret->asint = int_nil;
@@ -1729,7 +1729,7 @@
}
/* create a tzone as a simple hour difference from GMT. */
-inline int
+static inline int
tzone_create_dst(tzone *ret, int *minutes, rule *start, rule *end)
{
*ret = *tzone_nil;
@@ -1743,7 +1743,7 @@
}
/* create a tzone as an hour difference from GMT and a DST. */
-inline int
+static inline int
tzone_create(tzone *ret, int *minutes)
{
*ret = *tzone_nil;
@@ -1755,7 +1755,7 @@
}
/* extract month from rule. */
-inline int
+static inline int
rule_extract_month(int *ret, rule *r)
{
*ret = (r->asint == int_nil) ? int_nil : r->s.month;
@@ -1763,7 +1763,7 @@
}
/* extract day from rule. */
-inline int
+static inline int
rule_extract_day(int *ret, rule *r)
{
*ret = (r->asint == int_nil) ? int_nil : r->s.day - DAY_ZERO;
@@ -1771,7 +1771,7 @@
}
/* extract weekday from rule. */
-inline int
+static inline int
rule_extract_weekday(int *ret, rule *r)
{
*ret = (r->asint == int_nil) ? int_nil : r->s.weekday - WEEKDAY_ZERO;
@@ -1779,7 +1779,7 @@
}
/* extract minutes from rule. */
-inline int
+static inline int
rule_extract_minutes(int *ret, rule *r)
{
*ret = (r->asint == int_nil) ? int_nil : r->s.minutes;
@@ -1787,7 +1787,7 @@
}
/* extract rule that determines start of DST from tzone. */
-inline int
+static inline int
tzone_extract_start(rule *ret, tzone *t)
{
if (tz_isnil(*t) || !t->dst) {
@@ -1799,7 +1799,7 @@
}
/* extract rule that determines end of DST from tzone. */
-inline int
+static inline int
tzone_extract_end(rule *ret, tzone *t)
{
if (tz_isnil(*t) || !t->dst) {
@@ -1811,14 +1811,14 @@
}
/* extract number of minutes that tzone is offset wrt GMT. */
-inline int
+static inline int
tzone_extract_minutes(int *ret, tzone *t)
{
*ret = (tz_isnil(*t)) ? int_nil : get_offset(t);
return GDK_SUCCEED;
}
-inline int
+static inline int
date_sub_sec_interval_wrap(date *ret, date *t, int *sec)
{
if (*sec > 0) {
@@ -1829,7 +1829,7 @@
return GDK_SUCCEED;
}
-inline int
+static inline int
date_sub_sec_interval_lng_wrap(date *ret, date *t, lng *sec)
{
if (*sec > 0) {
@@ -1841,7 +1841,7 @@
return GDK_SUCCEED;
}
-inline int
+static inline int
date_add_sec_interval_wrap(date *ret, date *t, int *sec)
{
if (*sec > 0) {
@@ -1852,7 +1852,7 @@
return GDK_SUCCEED;
}
-inline int
+static inline int
date_add_sec_interval_lng_wrap(date *ret, date *t, lng *sec)
{
if (*sec > 0) {
@@ -1864,14 +1864,14 @@
return GDK_SUCCEED;
}
-inline int
+static inline int
date_sub_month_interval_wrap(date *ret, date *t, int *months)
{
return date_addmonths(ret, t, months);
}
/* compute the date from a rule in a certain year. */
-inline int
+static inline int
compute_rule_foryear(date *ret, rule *val, int *year)
{
if (*(int *) val == int_nil || *year < YEAR_MIN || *year > YEAR_MAX) {
@@ -1883,7 +1883,7 @@
}
/* Mx macro expansions */
-inline int date_comp_EQ(bit *retval, date *val1, date *val2)
+static inline int date_comp_EQ(bit *retval, date *val1, date *val2)
{
if (*val1 == date_nil || *val2 == date_nil)
*retval = bit_nil;
@@ -1892,7 +1892,7 @@
return GDK_SUCCEED;
}
-inline int date_comp_NE(bit *retval, date *val1, date *val2)
+static inline int date_comp_NE(bit *retval, date *val1, date *val2)
{
if (*val1 == date_nil || *val2 == date_nil)
*retval = bit_nil;
@@ -1901,7 +1901,7 @@
return GDK_SUCCEED;
}
-inline int date_comp_LT(bit *retval, date *val1, date *val2)
+static inline int date_comp_LT(bit *retval, date *val1, date *val2)
{
if (*val1 == date_nil || *val2 == date_nil)
*retval = bit_nil;
@@ -1910,7 +1910,7 @@
return GDK_SUCCEED;
}
-inline int date_comp_GT(bit *retval, date *val1, date *val2)
+static inline int date_comp_GT(bit *retval, date *val1, date *val2)
{
if (*val1 == date_nil || *val2 == date_nil)
*retval = bit_nil;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
