fixed forever loop on lua initialization

2 files changed, 9 insertions, 13 deletions

diff --git a/include/pkg.h b/include/pkg.h
index 47d1918..2410710 100644
--- a/include/pkg.h
+++ b/include/pkg.h
@@ -4,21 +4,21 @@
 #include "str.h"
 
 struct package_t;
-typedef bool (*package_hook_cb_t)(struct package_t *self);
-typedef str (*package_version_cb_t)(struct package_t *self);
+typedef bool (*package_hook_cb_t)(struct package_t *pkg);
+typedef str (*package_version_cb_t)(struct package_t *pkg);
 
 typedef struct package_t {
 	str name, version, url, src;
 	unsigned int dep_count;
 	bool is_local;
-	package_hook_cb_t setup, build, install, rem, on_update, fetch_sources;
+	package_hook_cb_t setup, build, install, rm, on_update, fetch_sources;
 	package_version_cb_t fetch_latest_version;
 } package_t;
 
-bool setup(package_t *self), build(package_t *self),
-	install(package_t *self), rem(package_t *self),
-	on_update(package_t *self),
-	fetch_sources(package_t *self);
-str fetch_latest_version(package_t *self);
+bool setup(package_t *pkg), build(package_t *pkg),
+	install(package_t *pkg), rm(package_t *pkg),
+	on_update(package_t *pkg),
+	fetch_sources(package_t *pkg);
+str fetch_latest_version(package_t *pkg);
 
 #endif
diff --git a/include/state.h b/include/state.h
index 9075270..a1c09d7 100644
--- a/include/state.h
+++ b/include/state.h
@@ -36,10 +36,6 @@ typedef struct config_t {
 	bool is_root;
 } user_config_t;
 
-typedef struct {
-	str prefix, bin, lib, include, src;
-} install_dirs_t;
-
 extern cli_flags_t flags;
 extern user_config_t config;
-extern install_dirs_t inst_dirs;
+extern inst_dirs_t inst_dirs;