[Olsr-dev] [PATCH v1 049/115] info: rename type printer_functions_t to info_plugin_functions_t

Ferry Huberts (spam-protected)
Wed Dec 2 21:28:22 CET 2015


From: Ferry Huberts <(spam-protected)>

Signed-off-by: Ferry Huberts <(spam-protected)>
---
 lib/info/info_types.h           | 2 +-
 lib/info/olsrd_info.c           | 4 ++--
 lib/info/olsrd_info.h           | 2 +-
 lib/jsoninfo/src/olsrd_plugin.c | 2 +-
 lib/txtinfo/src/olsrd_plugin.c  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/info/info_types.h b/lib/info/info_types.h
index dc24d35..11c54ff 100644
--- a/lib/info/info_types.h
+++ b/lib/info/info_types.h
@@ -98,7 +98,7 @@ typedef struct {
     printer_generic interfaces;
     printer_generic config;
     printer_generic plugins;
-} printer_functions_t;
+} info_plugin_functions_t;
 
 #define MAX_CLIENTS 3
 
diff --git a/lib/info/olsrd_info.c b/lib/info/olsrd_info.c
index 275a600..bfea91b 100644
--- a/lib/info/olsrd_info.c
+++ b/lib/info/olsrd_info.c
@@ -53,7 +53,7 @@
 #endif /* _WIN32 */
 
 static const char * PLUGIN_NAME = NULL;
-static printer_functions_t *printer_functions = NULL;
+static info_plugin_functions_t *printer_functions = NULL;
 static info_plugin_config_t *info_plugin_config;
 
 static int ipc_socket = -1;
@@ -403,7 +403,7 @@ static int plugin_ipc_init(void) {
  *This function is called by the my_init
  *function in uolsrd_plugin.c
  */
-int info_plugin_init(const char * plugin_name, printer_functions_t *functions, info_plugin_config_t *config) {
+int info_plugin_init(const char * plugin_name, info_plugin_functions_t *functions, info_plugin_config_t *config) {
   printer_functions = functions;
   PLUGIN_NAME = plugin_name;
   info_plugin_config = config;
diff --git a/lib/info/olsrd_info.h b/lib/info/olsrd_info.h
index 382d14d..b498653 100644
--- a/lib/info/olsrd_info.h
+++ b/lib/info/olsrd_info.h
@@ -44,7 +44,7 @@
 
 #include "info_types.h"
 
-int info_plugin_init(const char * plugin_name, printer_functions_t *functions, info_plugin_config_t *config);
+int info_plugin_init(const char * plugin_name, info_plugin_functions_t *functions, info_plugin_config_t *config);
 void info_plugin_exit(void);
 
 #endif /* _OLSRD_INFO_INFO_H */
diff --git a/lib/jsoninfo/src/olsrd_plugin.c b/lib/jsoninfo/src/olsrd_plugin.c
index fffdfe2..01c5fa8 100644
--- a/lib/jsoninfo/src/olsrd_plugin.c
+++ b/lib/jsoninfo/src/olsrd_plugin.c
@@ -53,7 +53,7 @@
 #define MOD_DESC PLUGIN_TITLE " " PLUGIN_VERSION " by " PLUGIN_AUTHOR
 #define PLUGIN_INTERFACE_VERSION 5
 
-static printer_functions_t printer_functions = { //
+static info_plugin_functions_t printer_functions = { //
     //
         .init = &plugin_init, //
         .is_command = &isCommand, //
diff --git a/lib/txtinfo/src/olsrd_plugin.c b/lib/txtinfo/src/olsrd_plugin.c
index 6f8247c..01fd2c2 100644
--- a/lib/txtinfo/src/olsrd_plugin.c
+++ b/lib/txtinfo/src/olsrd_plugin.c
@@ -53,7 +53,7 @@
 #define MOD_DESC PLUGIN_TITLE " " PLUGIN_VERSION " by " PLUGIN_AUTHOR
 #define PLUGIN_INTERFACE_VERSION 5
 
-static printer_functions_t printer_functions = { //
+static info_plugin_functions_t printer_functions = { //
     //
         .init = NULL, //
         .is_command = &isCommand, //
-- 
2.5.0




More information about the Olsr-dev mailing list