libelwix/src/time.c - diff

Return to time.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libelwix / src

Diff for /libelwix/src/time.c between versions 1.1.2.3 and 1.1.2.6

version 1.1.2.3, 2013/03/07 15:47:07	version 1.1.2.6, 2013/03/07 16:17:20
Line 83 stridx_compare(struct stridx * __restrict a, struct st	Line 83 stridx_compare(struct stridx * __restrict a, struct st
}	}

static int	static int
search4month(char * __restrict psMonth, int * __restrict id)	search4month(char * psMonth, int * __restrict id)
{	{
static int sorted = 0;	static int sorted = 0;
struct stridx *el;	struct stridx *el, item = { psMonth, 0 };

if (!psMonth)	if (!psMonth)
return -1;	return -1;
Line 98 search4month(char * __restrict psMonth, int * __restri	Line 98 search4month(char * __restrict psMonth, int * __restri
}	}

str_Lower(psMonth);	str_Lower(psMonth);
el = bsearch(psMonth, months, sizeof(months) / sizeof(struct stridx), sizeof(struct stridx),	el = bsearch(&item, months, sizeof(months) / sizeof(struct stridx), sizeof(struct stridx),
(int ()(const void, const void*)) stridx_compare);	(int ()(const void, const void*)) stridx_compare);
if (el && id)	if (el && id)
*id = el->id;	*id = el->id;
Line 110 static int	Line 110 static int
search4wday(char * __restrict psWDay, int * __restrict id)	search4wday(char * __restrict psWDay, int * __restrict id)
{	{
static int sorted = 0;	static int sorted = 0;
struct stridx *el;	struct stridx *el, item = { psWDay, 0 };

if (!psWDay)	if (!psWDay)
return -1;	return -1;
Line 122 search4wday(char * __restrict psWDay, int * __restrict	Line 122 search4wday(char * __restrict psWDay, int * __restrict
}	}

str_Lower(psWDay);	str_Lower(psWDay);
el = bsearch(psWDay, wdays, sizeof(wdays) / sizeof(struct stridx), sizeof(struct stridx),	el = bsearch(&item, wdays, sizeof(wdays) / sizeof(struct stridx), sizeof(struct stridx),
(int ()(const void, const void*)) stridx_compare);	(int ()(const void, const void*)) stridx_compare);
if (el && id)	if (el && id)
*id = el->id;	*id = el->id;
Line 135 search4wday(char * __restrict psWDay, int * __restrict	Line 135 search4wday(char * __restrict psWDay, int * __restrict
* time_Parse() - Parse and make unix time from standart time strings ...	* time_Parse() - Parse and make unix time from standart time strings ...
*	*
* @csTime = Time string	* @csTime = Time string
* return: =0 error or !=0 converted time	* return: =-1 error or !=-1 converted time
*/	*/
time_t	time_t
time_Parse(const char *csTime)	time_Parse(const char *csTime)
Line 247 time_Parse(const char *csTime)	Line 247 time_Parse(const char *csTime)
tm.tm_min = tm_min;	tm.tm_min = tm_min;
tm.tm_sec = tm_sec;	tm.tm_sec = tm_sec;
tm.tm_year = tm_year;	tm.tm_year = tm_year;
} else	} else {
	elwix_SetErr(EINVAL, "Invalid date/time format");
return (time_t) -1;	return (time_t) -1;
	}

if (tm.tm_year > 1900)	if (tm.tm_year > 1900)
tm.tm_year -= 1900;	tm.tm_year -= 1900;
Line 256 time_Parse(const char *csTime)	Line 258 time_Parse(const char *csTime)
tm.tm_year += 100;	tm.tm_year += 100;

if ((tim = timegm(&tm)) == (time_t) -1)	if ((tim = timegm(&tm)) == (time_t) -1)
return 0;	elwix_SetErr(EINVAL, "Invalid date/time format");
else	return tim;
return tim;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.2.3
changed lines
	Added in v.1.1.2.6