From: Stéphane Graber <stgraber@stgraber.org>
Date: Thu, 31 Aug 2023 04:46:14 +0000 (-0400)
Subject: lxccontainer.h: Move new fields to the end
X-Git-Tag: v6.0.0~44^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F4343%2Fhead;p=thirdparty%2Flxc.git

lxccontainer.h: Move new fields to the end

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
---

diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
index a87941d52..4c06183c9 100644
--- a/src/lxc/lxccontainer.h
+++ b/src/lxc/lxccontainer.h
@@ -94,12 +94,6 @@ struct lxc_container {
 	 */
 	struct lxc_conf *lxc_conf;
 
-	/*!
-	 * \private
-	 * SO_RCVTIMEO for LXC client_fd socket.
-	 */
-	int rcv_timeout;
-
 	/* public fields */
 	/*! Human-readable string representing last error */
 	char *error_string;
@@ -873,17 +867,6 @@ struct lxc_container {
 	 */
 	int (*seccomp_notify_fd_active)(struct lxc_container *c);
 
-	/*!
-	 * \brief Set response receive timeout for LXC commands
-	 *
-	 * \param c Container
-	 * \param timeout Seconds to wait before returning false.
-	 *  (-1 to wait forever).
-	 *
-	 * \return \c true on success, else \c false.
-	 */
-	bool (*set_timeout)(struct lxc_container *c, int timeout);
-
 	/*!
 	 * \brief Retrieve a pidfd for the container's init process.
 	 *
@@ -901,6 +884,23 @@ struct lxc_container {
 	 * \return Mount fd of the container's devpts instance.
 	 */
 	int (*devpts_fd)(struct lxc_container *c);
+
+	/*!
+	 * \private
+	 * SO_RCVTIMEO for LXC client_fd socket.
+	 */
+	int rcv_timeout;
+
+	/*!
+	 * \brief Set response receive timeout for LXC commands
+	 *
+	 * \param c Container
+	 * \param timeout Seconds to wait before returning false.
+	 *  (-1 to wait forever).
+	 *
+	 * \return \c true on success, else \c false.
+	 */
+	bool (*set_timeout)(struct lxc_container *c, int timeout);
 };
 
 /*!