ttail_format_guess() do not take ttail_t* as argument

Making this function usable by logfiles and stdin format autodetection

src/include/ttail_init.h

@@ -303,12 +303,11 @@ int _ttail_set_date_relative(ttail_t*, char*, int);
 int _ttail_norm_dates(ttail_t*);
 
 /**@brief Attempt to guess a dateformat
- *@param ttail_t* ttail if manage to guess set the ttail_t.fmt
  *@param const char* date as a dtring
  *@param struct tm* if non NULL will be set to detected date
- *@return -1 if no guess -2 if fmt already set else id in TTAIL_DEFAULT_FORMATS
+ *@return -1 if no guess else id in TTAIL_DEFAULT_FORMATS
  */
-int ttail_format_guess(ttail_t*, const char*, struct tm*);
+int ttail_format_guess(const char*, struct tm*);
 
 
 void ttail_free(ttail_t*);

src/ttail_init.c

@@ -443,11 +443,12 @@ int _ttail_set_date_fmt(ttail_t* res, char* date, int c)
 {
 	int ret;
 	char *endp;
+	char *fmt[] = TTAIL_DEFAULT_FORMATS;
 
 	if(!(res->flag & TTAIL_FLAG_FORMAT))
 	{
 		/* no format specified */
-		ret = ttail_format_guess(res, date,
+		ret = ttail_format_guess(date,
 			c==0?&(res->date_min):&(res->date_max));
 		if(ret < 0)
 		{
@@ -455,6 +456,15 @@ int _ttail_set_date_fmt(ttail_t* res, char* date, int c)
 date '%s'\n", date);
 			return -1;
 		}
+		res->fmt = malloc(sizeof(char)*(strlen(fmt[ret])+1));
+		if(!res->fmt)
+		{
+			perror("Unable to allocate memory for date format");
+			res->flag ^= TTAIL_FLAG_FORMAT;
+		}
+		strcpy(res->fmt, fmt[ret]);
+		res->flag |= TTAIL_FLAG_FORMAT;
+
 		res->flag |= c?TTAIL_FLAG_DATE_MAX:TTAIL_FLAG_DATE_MIN;
 		return 0;
 	}
@@ -650,7 +660,7 @@ we just strftime() !\n");
 	return 0;
 }
 
-int ttail_format_guess(ttail_t* t, const char* date_str, struct tm* tm)
+int ttail_format_guess(const char* date_str, struct tm* tm)
 {
 	int i, res;
 	char *res_ret, *ret;
@@ -659,11 +669,6 @@ int ttail_format_guess(ttail_t* t, const char* date_str, struct tm* tm)
 	
 	memset(&dte, 0, sizeof(struct tm));
 
-	if(t->flag & TTAIL_FLAG_FORMAT)
-	{
-		fprintf(stderr, "Format allready set\n");
-		return -2;
-	}
 	res = -1;
 	res_ret = NULL;
 	i=0;
@@ -680,21 +685,6 @@ int ttail_format_guess(ttail_t* t, const char* date_str, struct tm* tm)
 				{
 					memcpy(tm, &dte, sizeof(struct tm));
 				}
-				if(t->fmt)
-				{
-					free(t->fmt);
-				}
-				t->fmt = malloc(
-					sizeof(char)*(strlen(fmt[i])+1));
-				if(!t->fmt)
-				{
-					perror("Unable to allocate memory\
-for date format");
-					t->flag ^= TTAIL_FLAG_FORMAT;
-					return -1;
-				}
-				strcpy(t->fmt, fmt[i]);
-				t->flag |= TTAIL_FLAG_FORMAT;
 			}
 		}
 		i++;

tests/ttail_init_format_guess.c

@@ -15,12 +15,9 @@ START_TEST (test_init_guess_date)
 	int ret;
 	struct tm tm;
 	char res[] = "%Y/%m/%d";
-	ret = ttail_format_guess(ttail, "1988/10/22", &tm);
+	ret = ttail_format_guess("1988/10/22", &tm);
 	ck_assert_int_ne(ret, -1);
 	ck_assert_str_eq(fmt[ret], res);
-	ck_assert(ttail->fmt != NULL);
-	ck_assert_str_eq(ttail->fmt, res);
-	ck_assert((ttail->flag & TTAIL_FLAG_FORMAT) == TTAIL_FLAG_FORMAT);
 	ck_assert_int_eq(tm.tm_year, 88);
 	ck_assert_int_eq(tm.tm_mon, 9);
 	ck_assert_int_eq(tm.tm_mday, 22);
@@ -35,12 +32,9 @@ START_TEST (test_init_guess_datetime)
 	int ret;
 	struct tm tm;
 	char res[] = "%Y/%m/%d:%H:%M";
-	ret = ttail_format_guess(ttail, "1988/10/22:22:10:00", &tm);
+	ret = ttail_format_guess("1988/10/22:22:10:00", &tm);
 	ck_assert_int_ne(ret, -1);
 	ck_assert_str_eq(fmt[ret], res);
-	ck_assert(ttail->fmt != NULL);
-	ck_assert_str_eq(ttail->fmt, res);
-	ck_assert((ttail->flag & TTAIL_FLAG_FORMAT) == TTAIL_FLAG_FORMAT);
 	ck_assert_int_eq(tm.tm_year, 88);
 	ck_assert_int_eq(tm.tm_mon, 9);
 	ck_assert_int_eq(tm.tm_mday, 22);
@@ -55,12 +49,9 @@ START_TEST (test_init_guess_datetime2)
 	int ret;
 	struct tm tm;
 	char res[] = "%B%n%d %H:%M:%S";
-	ret = ttail_format_guess(ttail, "Mar  6 00:01:39 pilgrim dhclient", &tm);
+	ret = ttail_format_guess("Mar  6 00:01:39 pilgrim dhclient", &tm);
 	ck_assert_int_ne(ret, -1);
 	ck_assert_str_eq(fmt[ret], res);
-	ck_assert(ttail->fmt != NULL);
-	ck_assert_str_eq(ttail->fmt, res);
-	ck_assert((ttail->flag & TTAIL_FLAG_FORMAT) == TTAIL_FLAG_FORMAT);
 	ck_assert_int_eq(tm.tm_year, 0);
 	ck_assert_int_eq(tm.tm_mon, 2);
 	ck_assert_int_eq(tm.tm_mday, 6);
@@ -74,10 +65,8 @@ START_TEST (test_init_guess_noguess)
 {
 	int ret;
 	struct tm tm;
-	ret = ttail_format_guess(ttail, "notadate", &tm);
+	ret = ttail_format_guess("notadate", &tm);
 	ck_assert_int_eq(ret, -1);
-	ck_assert(ttail->fmt == NULL);
-	ck_assert((ttail->flag & TTAIL_FLAG_FORMAT) == 0);
 	ck_assert_int_eq(tm.tm_year, 0);
 	ck_assert_int_eq(tm.tm_mon, 0);
 	ck_assert_int_eq(tm.tm_mday, 0);
@@ -91,12 +80,9 @@ START_TEST (test_init_guess_date_notm)
 {
 	int ret;
 	char res[] = "%Y/%m/%d";
-	ret = ttail_format_guess(ttail, "1988/10/22", NULL);
+	ret = ttail_format_guess("1988/10/22", NULL);
 	ck_assert_int_ne(ret, -1);
 	ck_assert_str_eq(fmt[ret], res);
-	ck_assert(ttail->fmt != NULL);
-	ck_assert_str_eq(ttail->fmt, res);
-	ck_assert((ttail->flag & TTAIL_FLAG_FORMAT) == TTAIL_FLAG_FORMAT);
 }
 END_TEST
 
@@ -104,26 +90,13 @@ START_TEST (test_init_guess_noguess_notm)
 {
 	int ret;
 	struct tm tm;
-	ret = ttail_format_guess(ttail, "notadate", &tm);
+	ret = ttail_format_guess("notadate", &tm);
 	ck_assert_int_eq(ret, -1);
 	ck_assert(ttail->fmt == NULL);
 	ck_assert((ttail->flag & TTAIL_FLAG_FORMAT) == 0);
 }
 END_TEST
 
-START_TEST (test_init_guess_fmt_set)
-{
-	int ret;
-	char res[] = "%Y/%m/%d";
-	ret = ttail_format_guess(ttail, "1988/10/22", NULL);
-	ck_assert_str_eq(fmt[ret], res);
-	ret = ttail_format_guess(ttail, "1988/10/22", NULL);
-	ck_assert_int_eq(ret, -2);
-	ck_assert_str_eq(ttail->fmt, res);
-	ck_assert((ttail->flag & TTAIL_FLAG_FORMAT) == TTAIL_FLAG_FORMAT);
-}
-END_TEST
-
 TTAIL_CHECK_START("ttail init checks", "date format guess init checks")
 	TTAIL_SET_FIXTURE(setup_ttail_empty, teardown_ttail);
 	TTAIL_ADD_TEST(test_init_guess_date);
@@ -132,6 +105,5 @@ TTAIL_CHECK_START("ttail init checks", "date format guess init checks")
 	TTAIL_ADD_TEST(test_init_guess_noguess);
 	TTAIL_ADD_TEST(test_init_guess_date_notm);
 	TTAIL_ADD_TEST(test_init_guess_noguess_notm);
-	TTAIL_ADD_TEST(test_init_guess_fmt_set);
 TTAIL_CHECK_END