--- libaitsched/src/aitsched.c	2022/10/17 22:45:06	1.29
+++ libaitsched/src/aitsched.c	2023/01/18 23:46:18	1.30
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.c,v 1.29 2022/10/17 22:45:06 misho Exp $
+* $Id: aitsched.c,v 1.30 2023/01/18 23:46:18 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004 - 2022
+Copyright 2004 - 2023
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -560,53 +560,52 @@ schedQuery(sched_task_t * __restrict task)
  * 	[ CRITERIA_ANY|CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL|
  * 		CRITERIA_ID|CRITERIA_TS|CRITERIA_DATA|CRITERIA_DATLEN ]
  * @param = search parameter
- * return: -1 error, 0 found or 1 not found
+ * return: NULL not found or !=NULL task
  */
-int
+sched_task_t *
 schedQueryby(sched_root_task_t * __restrict root, sched_task_type_t type, 
 		u_char criteria, void *param)
 {
 	sched_task_t *task;
 	sched_queue_t *queue;
-	register int flg = 0;
 
 	if (!root)
-		return -1;
+		return NULL;
 	/* if type == taskMAX check in all queues */
 	if (type == taskMAX) {
-		if ((flg = schedQueryby(root, taskREAD, criteria, param)) < 1)
-			return flg;
-		if ((flg = schedQueryby(root, taskWRITE, criteria, param)) < 1)
-			return flg;
-		if ((flg = schedQueryby(root, taskTIMER, criteria, param)) < 1)
-			return flg;
-		if ((flg = schedQueryby(root, taskALARM, criteria, param)) < 1)
-			return flg;
-		if ((flg = schedQueryby(root, taskRTC, criteria, param)) < 1)
-			return flg;
-		if ((flg = schedQueryby(root, taskNODE, criteria, param)) < 1)
-			return flg;
-		if ((flg = schedQueryby(root, taskPROC, criteria, param)) < 1)
-			return flg;
-		if ((flg = schedQueryby(root, taskSIGNAL, criteria, param)) < 1)
-			return flg;
-		if ((flg = schedQueryby(root, taskAIO, criteria, param)) < 1)
-			return flg;
-		if ((flg = schedQueryby(root, taskLIO, criteria, param)) < 1)
-			return flg;
-		if ((flg = schedQueryby(root, taskUSER, criteria, param)) < 1)
-			return flg;
-		if ((flg = schedQueryby(root, taskEVENT, criteria, param)) < 1)
-			return flg;
-		if ((flg = schedQueryby(root, taskTASK, criteria, param)) < 1)
-			return flg;
-		if ((flg = schedQueryby(root, taskSUSPEND, criteria, param)) < 1)
-			return flg;
-		if ((flg = schedQueryby(root, taskREADY, criteria, param)) < 1)
-			return flg;
-		if ((flg = schedQueryby(root, taskTHREAD, criteria, param)) < 1)
-			return flg;
-		return 1;	/* not found */
+		if ((task = schedQueryby(root, taskREAD, criteria, param)))
+			return task;
+		if ((task = schedQueryby(root, taskWRITE, criteria, param)))
+			return task;
+		if ((task = schedQueryby(root, taskTIMER, criteria, param)))
+			return task;
+		if ((task = schedQueryby(root, taskALARM, criteria, param)))
+			return task;
+		if ((task = schedQueryby(root, taskRTC, criteria, param)))
+			return task;
+		if ((task = schedQueryby(root, taskNODE, criteria, param)))
+			return task;
+		if ((task = schedQueryby(root, taskPROC, criteria, param)))
+			return task;
+		if ((task = schedQueryby(root, taskSIGNAL, criteria, param)))
+			return task;
+		if ((task = schedQueryby(root, taskAIO, criteria, param)))
+			return task;
+		if ((task = schedQueryby(root, taskLIO, criteria, param)))
+			return task;
+		if ((task = schedQueryby(root, taskUSER, criteria, param)))
+			return task;
+		if ((task = schedQueryby(root, taskEVENT, criteria, param)))
+			return task;
+		if ((task = schedQueryby(root, taskTASK, criteria, param)))
+			return task;
+		if ((task = schedQueryby(root, taskSUSPEND, criteria, param)))
+			return task;
+		if ((task = schedQueryby(root, taskREADY, criteria, param)))
+			return task;
+		if ((task = schedQueryby(root, taskTHREAD, criteria, param)))
+			return task;
+		return NULL;	/* not found */
 	}
 	/* choosen queue */
 	switch (type) {
@@ -659,51 +658,51 @@ schedQueryby(sched_root_task_t * __restrict root, sche
 			queue = &root->root_thread;
 			break;
 		default:
-			return 1;	/* not found */
+			return NULL;	/* not found */
 	}
 
 	TAILQ_FOREACH(task, queue, task_node) {
 		switch (criteria) {
 			case CRITERIA_ANY:
-				return 0;		/* found */
+				return task;		/* found */
 			case CRITERIA_CALL:
 				if (TASK_FUNC(task) == (sched_task_func_t) param)
-					return 0;	/* found */
+					return task;	/* found */
 				break;
 			case CRITERIA_ARG:
 				if (TASK_ARG(task) == param)
-					return 0;	/* found */
+					return task;	/* found */
 				break;
 			case CRITERIA_FD:
 				if (TASK_FD(task) == (intptr_t) param)
-					return 0;	/* found */
+					return task;	/* found */
 				break;
 			case CRITERIA_ID:
 			case CRITERIA_VAL:
 				if (TASK_VAL(task) == (u_long) param)
-					return 0;	/* found */
+					return task;	/* found */
 				break;
 			case CRITERIA_TS:
 				if (!sched_timespeccmp(&TASK_TS(task), 
 							(struct timespec*) param, -))
-					return 0;	/* found */
+					return task;	/* found */
 				break;
 			case CRITERIA_DATA:
 				if (TASK_DATA(task) == param)
-					return 0;	/* found */
+					return task;	/* found */
 				break;
 			case CRITERIA_DATLEN:
 				if (TASK_DATLEN(task) == (size_t) param)
-					return 0;	/* found */
+					return task;	/* found */
 				break;
 			default:
 				sched_SetErr(EINVAL, "Invalid parameter criteria %d", 
 						criteria);
-				return 1;		/* not found */
+				return NULL;		/* not found */
 		}
 	}
 
-	return 1;	/* not found */
+	return NULL;	/* not found */
 }
 
 /*