From: Kay Sievers <kay.sievers@vrfy.org>
Date: Wed, 11 Mar 2009 12:32:39 +0000 (+0100)
Subject: libudev: ctrl - return error after sending ctrl message
X-Git-Tag: 174~1129
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=89d080c3aedacadfb0b1022e101957998d4cdaf1

libudev: ctrl - return error after sending ctrl message
---

diff --git a/configure.ac b/configure.ac
index ab92a86ad..3a624308d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,9 +15,9 @@ AC_PREFIX_DEFAULT([/usr])
 test "$prefix" = NONE && test "$exec_prefix" = NONE && exec_prefix=
 
 dnl /* libudev version */
-LIBUDEV_LT_CURRENT=0
-LIBUDEV_LT_REVISION=10
-LIBUDEV_LT_AGE=0
+LIBUDEV_LT_CURRENT=1
+LIBUDEV_LT_REVISION=0
+LIBUDEV_LT_AGE=1
 AC_SUBST(LIBUDEV_LT_CURRENT)
 AC_SUBST(LIBUDEV_LT_REVISION)
 AC_SUBST(LIBUDEV_LT_AGE)
diff --git a/udev/lib/libudev-ctrl.c b/udev/lib/libudev-ctrl.c
index caf0dc08a..570e91c89 100644
--- a/udev/lib/libudev-ctrl.c
+++ b/udev/lib/libudev-ctrl.c
@@ -168,38 +168,32 @@ static int ctrl_send(struct udev_ctrl *uctrl, enum udev_ctrl_msg_type type, int
 
 int udev_ctrl_send_set_log_level(struct udev_ctrl *uctrl, int priority)
 {
-	ctrl_send(uctrl, UDEV_CTRL_SET_LOG_LEVEL, priority, NULL);
-	return 0;
+	return ctrl_send(uctrl, UDEV_CTRL_SET_LOG_LEVEL, priority, NULL);
 }
 
 int udev_ctrl_send_stop_exec_queue(struct udev_ctrl *uctrl)
 {
-	ctrl_send(uctrl, UDEV_CTRL_STOP_EXEC_QUEUE, 0, NULL);
-	return 0;
+	return ctrl_send(uctrl, UDEV_CTRL_STOP_EXEC_QUEUE, 0, NULL);
 }
 
 int udev_ctrl_send_start_exec_queue(struct udev_ctrl *uctrl)
 {
-	ctrl_send(uctrl, UDEV_CTRL_START_EXEC_QUEUE, 0, NULL);
-	return 0;
+	return ctrl_send(uctrl, UDEV_CTRL_START_EXEC_QUEUE, 0, NULL);
 }
 
 int udev_ctrl_send_reload_rules(struct udev_ctrl *uctrl)
 {
-	ctrl_send(uctrl, UDEV_CTRL_RELOAD_RULES, 0, NULL);
-	return 0;
+	return ctrl_send(uctrl, UDEV_CTRL_RELOAD_RULES, 0, NULL);
 }
 
 int udev_ctrl_send_set_env(struct udev_ctrl *uctrl, const char *key)
 {
-	ctrl_send(uctrl, UDEV_CTRL_SET_ENV, 0, key);
-	return 0;
+	return ctrl_send(uctrl, UDEV_CTRL_SET_ENV, 0, key);
 }
 
 int udev_ctrl_send_set_max_childs(struct udev_ctrl *uctrl, int count)
 {
-	ctrl_send(uctrl, UDEV_CTRL_SET_MAX_CHILDS, count, NULL);
-	return 0;
+	return ctrl_send(uctrl, UDEV_CTRL_SET_MAX_CHILDS, count, NULL);
 }
 
 struct udev_ctrl_msg *udev_ctrl_receive_msg(struct udev_ctrl *uctrl)