From ec4a47e5db37f2ecf0bb64eb76970a868b6264f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Sun, 13 Jan 2019 11:18:32 +0100
Subject: [PATCH] modules: rename module_info -> plugin_info

This is the same name used by particles.
---
 modules/alsa.c       | 2 +-
 modules/backlight.c  | 2 +-
 modules/battery.c    | 2 +-
 modules/clock.c      | 2 +-
 modules/i3.c         | 2 +-
 modules/label.c      | 2 +-
 modules/mpd.c        | 2 +-
 modules/network.c    | 2 +-
 modules/removables.c | 2 +-
 modules/xkb.c        | 2 +-
 modules/xwindow.c    | 2 +-
 plugin.c             | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/alsa.c b/modules/alsa.c
index 968f777..c8f1562 100644
--- a/modules/alsa.c
+++ b/modules/alsa.c
@@ -280,7 +280,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
         conf_to_particle(content, parent_font));
 }
 
-const struct module_info module_info = {
+const struct module_info plugin_info = {
     .from_conf = &from_conf,
     .attr_count = 4,
     .attrs = {
diff --git a/modules/backlight.c b/modules/backlight.c
index 8c06851..5848640 100644
--- a/modules/backlight.c
+++ b/modules/backlight.c
@@ -224,7 +224,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
         yml_value_as_string(name), conf_to_particle(c, parent_font));
 }
 
-const struct module_info module_info = {
+const struct module_info plugin_info = {
     .from_conf = &from_conf,
     .attr_count = 3,
     .attrs = {
diff --git a/modules/battery.c b/modules/battery.c
index 3c42a16..b4812f0 100644
--- a/modules/battery.c
+++ b/modules/battery.c
@@ -356,7 +356,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
         poll_interval != NULL ? yml_value_as_int(poll_interval) : 60);
 }
 
-const struct module_info module_info = {
+const struct module_info plugin_info = {
     .from_conf = &from_conf,
     .attr_count = 4,
     .attrs = {
diff --git a/modules/clock.c b/modules/clock.c
index 6a9841e..8834571 100644
--- a/modules/clock.c
+++ b/modules/clock.c
@@ -107,7 +107,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
         time_format != NULL ? yml_value_as_string(time_format) : "%H:%M");
 }
 
-const struct module_info module_info = {
+const struct module_info plugin_info = {
     .from_conf = &from_conf,
     .attr_count = 4,
     .attrs = {
diff --git a/modules/i3.c b/modules/i3.c
index 9b6bb2d..924fedb 100644
--- a/modules/i3.c
+++ b/modules/i3.c
@@ -701,7 +701,7 @@ verify_content(keychain_t *chain, const struct yml_node *node)
     return true;
 }
 
-const struct module_info module_info = {
+const struct module_info plugin_info = {
     .from_conf = &from_conf,
     .attr_count = 5,
     .attrs = {
diff --git a/modules/label.c b/modules/label.c
index ab7b2d6..a0553ac 100644
--- a/modules/label.c
+++ b/modules/label.c
@@ -53,7 +53,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
     return label_new(conf_to_particle(c, parent_font));
 }
 
-const struct module_info module_info = {
+const struct module_info plugin_info = {
     .from_conf = &from_conf,
     .attr_count = 2,
     .attrs = {
diff --git a/modules/mpd.c b/modules/mpd.c
index c833e5d..7d72be1 100644
--- a/modules/mpd.c
+++ b/modules/mpd.c
@@ -491,7 +491,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
         conf_to_particle(c, parent_font));
 }
 
-const struct module_info module_info = {
+const struct module_info plugin_info = {
     .from_conf = &from_conf,
     .attr_count = 4,
     .attrs = {
diff --git a/modules/network.c b/modules/network.c
index 598a3eb..c918291 100644
--- a/modules/network.c
+++ b/modules/network.c
@@ -543,7 +543,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
         yml_value_as_string(name), conf_to_particle(content, parent_font));
 }
 
-const struct module_info module_info = {
+const struct module_info plugin_info = {
     .from_conf = &from_conf,
     .attr_count = 3,
     .attrs = {
diff --git a/modules/removables.c b/modules/removables.c
index caa6100..a76e001 100644
--- a/modules/removables.c
+++ b/modules/removables.c
@@ -577,7 +577,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
         conf_to_particle(content, parent_font), left, right);
 }
 
-const struct module_info module_info = {
+const struct module_info plugin_info = {
     .from_conf = &from_conf,
     .attr_count = 5,
     .attrs = {
diff --git a/modules/xkb.c b/modules/xkb.c
index 3b1d2d7..2e20aa0 100644
--- a/modules/xkb.c
+++ b/modules/xkb.c
@@ -459,7 +459,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
     return xkb_new(conf_to_particle(c, parent_font));
 }
 
-const struct module_info module_info = {
+const struct module_info plugin_info = {
     .from_conf = &from_conf,
     .attr_count = 2,
     .attrs = {
diff --git a/modules/xwindow.c b/modules/xwindow.c
index 167d1fa..7d95023 100644
--- a/modules/xwindow.c
+++ b/modules/xwindow.c
@@ -321,7 +321,7 @@ from_conf(const struct yml_node *node, const struct font *parent_font)
     return xwindow_new(conf_to_particle(c, parent_font));
 }
 
-const struct module_info module_info = {
+const struct module_info plugin_info = {
     .from_conf = &from_conf,
     .attr_count = 2,
     .attrs = {
diff --git a/plugin.c b/plugin.c
index 38bc0e2..3e665de 100644
--- a/plugin.c
+++ b/plugin.c
@@ -69,7 +69,7 @@ plugin_load(const char *name, enum plugin_type type)
 
     /* TODO: rename to plugin_info or so, in both modules and particles */
     dlerror(); /* Clear previous error */
-    plug->sym = dlsym(lib, type == PLUGIN_MODULE ? "module_info" : "plugin_info");
+    plug->sym = dlsym(lib, "plugin_info");
 
     const char *dlsym_error = dlerror();
     if (dlsym_error != NULL) {