From: Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
Date: Fri, 2 Dec 2011 23:10:24 +0000 (-0200)
Subject: reorder struct fields to avoid holes, improving packing
X-Git-Tag: v1~125
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d3f3ef815cf9012ad54a0e0bda21aed8e7afa33;p=thirdparty%2Fkmod.git

reorder struct fields to avoid holes, improving packing
---

diff --git a/libkmod/libkmod-loaded.c b/libkmod/libkmod-loaded.c
index 26798961..06f7f314 100644
--- a/libkmod/libkmod-loaded.c
+++ b/libkmod/libkmod-loaded.c
@@ -44,17 +44,17 @@
  */
 struct kmod_loaded {
 	struct kmod_ctx *ctx;
-	int refcount;
 	struct kmod_list *modules;
+	int refcount;
 	bool parsed;
 };
 
 struct kmod_loaded_module {
 	char *name;
 	long size;
-	int use_count;
 	char *deps;
 	uintptr_t addr;
+	int use_count;
 };
 
 KMOD_EXPORT int kmod_loaded_new(struct kmod_ctx *ctx, struct kmod_loaded **mod)
diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
index 969d3049..ac815b27 100644
--- a/libkmod/libkmod-module.c
+++ b/libkmod/libkmod-module.c
@@ -42,11 +42,10 @@
  */
 struct kmod_module {
 	struct kmod_ctx *ctx;
-	int refcount;
 	const char *path;
 	const char *name;
 	struct kmod_list *dep;
-
+	int refcount;
 	struct {
 		bool dep : 1;
 	} init;
diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
index c9966e0c..af784ea8 100644
--- a/libkmod/libkmod.c
+++ b/libkmod/libkmod.c
@@ -47,12 +47,12 @@
  */
 struct kmod_ctx {
 	int refcount;
+	int log_priority;
 	void (*log_fn)(struct kmod_ctx *ctx,
 			int priority, const char *file, int line,
 			const char *fn, const char *format, va_list args);
 	const void *userdata;
 	char *dirname;
-	int log_priority;
 	struct kmod_config config;
 };