Generalization of ttail_getline() macro

src/include/ttail_search.h

@@ -22,6 +22,17 @@ typedef char* (*ttail_search_subst_f)(ttail_t*, const char*);
  */
 typedef int ttail_cmp_res;
 
+/**@brief Convenient wrapper for getline
+ *@param ttail_t* TTAIL
+ *@param size_t ID file id
+ *@return @ref getline()
+ */
+#define ttail_getline(TTAIL, ID, SESS) (getline(\
+	&(TTAIL->session->SESS.buf), &(TTAIL->session->SESS.buf_sz),\
+	TTAIL->logfile[ID]))
+/*<!Accessor to getline wrapper buffer */
+#define ttail_std_getline_buf(TTAIL) (TTAIL->session->std.buf)
+#define ttail_std_getline(TTAIL, ID) ttail_getline(TTAIL, ID, std)
 
 #include "config.h"
 #include "ttail_search_files.h"

src/include/ttail_search_files.h

@@ -62,11 +62,9 @@ struct _ttail_search_file_s
  *@param size_t ID file id
  *@return @ref getline()
  */
-#define ttail_getline(TTAIL, ID) (getline(\
-	&(TTAIL->session->file.buf), &(TTAIL->session->file.buf_sz),\
-	TTAIL->logfile[ID]))
+#define ttail_file_getline(TTAIL, ID) (ttail_getline(TTAIL, ID, file))
 /*<!Accessor to getline wrapper buffer */
-#define ttail_getline_buf(TTAIL) (TTAIL->session->file.buf)
+#define ttail_file_getline_buf(TTAIL) (TTAIL->session->file.buf)
 
 /**@brief @ref ttail_search_closest() implementation for logfiles
  *

src/ttail_search_files.c

@@ -179,13 +179,13 @@ void _ttail_search_print_files(ttail_t* t, int out)
 				{
 					return;
 				}
-				if((r = ttail_getline(t, i)) < 0)
+				if((r = ttail_file_getline(t, i)) < 0)
 				{
 					break;
 				}
 				cur_off += r;
-				write(out, ttail_getline_buf(t),
-					strlen(ttail_getline_buf(t)));
+				write(out, ttail_file_getline_buf(t),
+					strlen(ttail_file_getline_buf(t)));
 			}
 			else
 			{
@@ -535,11 +535,11 @@ inline int _ttail_file_minmax(ttail_t* t, size_t id, struct tm tm[2])
 	}
 	while(1)
 	{
-		if(ttail_getline(t, id) < 0)
+		if(ttail_file_getline(t, id) < 0)
 		{
 			return 1;
 		}
-		if(!ttail_logline2date(t, ttail_getline_buf(t), tm))
+		if(!ttail_logline2date(t, ttail_file_getline_buf(t), tm))
 		{
 			break;
 		}
@@ -555,11 +555,11 @@ inline int _ttail_file_minmax(ttail_t* t, size_t id, struct tm tm[2])
 		{
 			return -1;
 		}
-		if(ttail_getline(t, id) < 0)
+		if(ttail_file_getline(t, id) < 0)
 		{
 			return 1;
 		}
-		if(!ttail_logline2date(t, ttail_getline_buf(t), tm+1))
+		if(!ttail_logline2date(t, ttail_file_getline_buf(t), tm+1))
 		{
 			break;
 		}
@@ -722,11 +722,11 @@ inline off_t _ttail_from_search_from_end(ttail_t* t , size_t id ,
 		{
 			break;
 		}
-		if(ttail_getline(t, id) < 0)
+		if(ttail_file_getline(t, id) < 0)
 		{
 			break;
 		}
-		ret = ttail_logline2date(t, ttail_getline_buf(t), &curtm);
+		ret = ttail_logline2date(t, ttail_file_getline_buf(t), &curtm);
 		if(ret < 0)
 		{
 			break;
@@ -769,7 +769,7 @@ inline int _ttail_file_off_cmp(ttail_t* t, size_t id, off_t off,
 		perror("Unable to set position in file");
 		return -1;
 	}
-	if(ttail_getline(t, id) < 0)
+	if(ttail_file_getline(t, id) < 0)
 	{
 		perror("Unable to read a line from file");
 		return -1;
@@ -781,11 +781,11 @@ inline int _ttail_file_cur_cmp(ttail_t* t, size_t id, const struct tm* tm ,
 {
 	int ret;
 	struct tm ctm;
-	if(ttail_getline(t, id) < 0)
+	if(ttail_file_getline(t, id) < 0)
 	{
 		return -1;
 	}
-	ret = ttail_logline2date(t, ttail_getline_buf(t), &ctm);
+	ret = ttail_logline2date(t, ttail_file_getline_buf(t), &ctm);
 	if(ret)
 	{
 		return -1;