Change utils on struct tm

Enhancement in comparison behavior + print function

src/include/ttail_search.h

@@ -95,4 +95,12 @@ const char* ttail_logline_subst(ttail_t*, const char*);
  */
 int ttail_tm_cmp(const struct tm*, const struct tm*);
 
+/**<! Set all fields to -1 */
+void ttail_tm_init(struct tm* tm);
+
+/**@brief Print a struct tm on stdout
+ *@param struct tm *
+ */
+void ttail_tm_print(const struct tm*);
+
 #endif

src/ttail_search.c

@@ -30,7 +30,7 @@ int ttail_logline2date(ttail_t* ttail, const char* logline, struct tm* tm)
 {
 	const char *subst, *ret;
 
-	memset(tm, 0,sizeof(struct tm));
+	ttail_tm_init(tm);
 
 	subst = ttail_logline_subst(ttail, logline);
 	if(!subst)
@@ -75,17 +75,55 @@ const char* ttail_logline_subst(ttail_t* t, const char* logline)
 int ttail_tm_cmp(const struct tm *ta, const struct tm *tb)
 {
 	int r;
-	r = ta->tm_year - tb->tm_year;
-	if(r) { return r; }
-	r = ta->tm_mon - tb->tm_mon;
-	if(r) { return r; }
-	r = ta->tm_mday - tb->tm_mday;
-	if(r) { return r; }
-	r = ta->tm_hour - tb->tm_hour;
-	if(r) { return r; }
-	r = ta->tm_min - tb->tm_min;
-	if(r) { return r; }
-	r = ta->tm_sec - tb->tm_sec;
+	r=0;
+	if(ta->tm_year >= 0 && ta->tm_year >= 0)
+	{
+		r = ta->tm_year - tb->tm_year;
+		if(r) { return r; }
+	}
+	if(ta->tm_mon >= 0 && ta->tm_mon >= 0)
+	{
+		r = ta->tm_mon - tb->tm_mon;
+		if(r) { return r; }
+	}
+	if(ta->tm_mday >= 0 && ta->tm_mday >= 0)
+	{
+		r = ta->tm_mday - tb->tm_mday;
+		if(r) { return r; }
+	}
+	if(ta->tm_hour >= 0 && ta->tm_hour >= 0)
+	{
+		r = ta->tm_hour - tb->tm_hour;
+		if(r) { return r; }
+	}
+	if(ta->tm_min >= 0 && ta->tm_min >= 0)
+	{
+		r = ta->tm_min - tb->tm_min;
+		if(r) { return r; }
+	}
+	if(ta->tm_sec >= 0 && ta->tm_sec >= 0)
+	{
+		r = ta->tm_sec - tb->tm_sec;
+	}
 	return r;
 }
 
+void ttail_tm_init(struct tm* tm)
+{
+	size_t i;
+	int *ptr;
+	ptr = (int*)tm;
+	for(i=0; i<sizeof(struct tm)/sizeof(int); i++)
+	{
+		*ptr = -1;
+		ptr++;
+	}
+}
+
+void ttail_tm_print(const struct tm* tm)
+{
+	printf("year:%d month:%d mday:%d hour:%d min:%d sec:%d",
+		tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min,
+		tm->tm_sec);
+}
+