summaryrefslogtreecommitdiff
path: root/lib9p/core_include
diff options
context:
space:
mode:
authorLuke T. Shumaker <lukeshu@lukeshu.com>2025-06-06 23:00:33 -0600
committerLuke T. Shumaker <lukeshu@lukeshu.com>2025-06-06 23:00:33 -0600
commitb5a29a4c57f09ed11b4591f99493fd57fdcee593 (patch)
treec558294e0237a31b2fca737437bfa82486834c4e /lib9p/core_include
parentce8ae41d677875adb45d99c351bcba108fb82a44 (diff)
parent940ac0d72be1e6d13b924f3ca2d32bad5b41b6ab (diff)
Merge branch 'lukeshu/misc'
Diffstat (limited to 'lib9p/core_include')
-rw-r--r--lib9p/core_include/lib9p/_core_generated.h2
-rw-r--r--lib9p/core_include/lib9p/core.h8
2 files changed, 4 insertions, 6 deletions
diff --git a/lib9p/core_include/lib9p/_core_generated.h b/lib9p/core_include/lib9p/_core_generated.h
index d1ecd6e..de7795a 100644
--- a/lib9p/core_include/lib9p/_core_generated.h
+++ b/lib9p/core_include/lib9p/_core_generated.h
@@ -6,8 +6,6 @@
/* config *********************************************************************/
-#include "config.h"
-
#ifndef CONFIG_9P_ENABLE_9P2000
#error config.h must define CONFIG_9P_ENABLE_9P2000
#endif
diff --git a/lib9p/core_include/lib9p/core.h b/lib9p/core_include/lib9p/core.h
index 1fb71f1..27553a3 100644
--- a/lib9p/core_include/lib9p/core.h
+++ b/lib9p/core_include/lib9p/core.h
@@ -16,7 +16,9 @@
#include <libmisc/fmt.h>
#define CONFIG_9P_ENABLE_uninitialized 1
-#include <lib9p/_core_generated.h>
+#include "config.h"
+
+#include <lib9p/_core_generated.h> /* _after_ other includes, including config.h */
#ifndef CONFIG_9P_MAX_ERR_SIZE
#error config.h must define CONFIG_9P_MAX_ERR_SIZE
@@ -202,14 +204,12 @@ void lib9p_stat_unmarshal(struct lib9p_ctx *ctx, uint8_t *net_bytes,
* marshal bitfield bits that aren't in ctx->version; it applies a
* version-specific mask to bitfields.
*
- * @param ctx : negotiated protocol parameters, where to record errors
+ * @param ctx : negotiated protocol parameters
* @param max_net_size : the maximum network-encoded size to allow
* @param obj : the message to encode
*
* @return ret_bytes: the buffer to encode into
* @return the number of bytes written, or 0 if the stat object does not fit in max_net_size
- *
- * @errno L_ERANGE: reply does not fit in max_net_size
*/
uint32_t lib9p_stat_marshal(struct lib9p_ctx *ctx, uint32_t max_net_size, struct lib9p_stat *obj,
uint8_t *ret_bytes);