Part 2, plugins. - Lauri
>From ecd54739b1e22c5ecb2a3f4d5f54d2f95580ddc1 Mon Sep 17 00:00:00 2001 From: Lauri Kasanen <[email protected]> Date: Fri, 27 Jul 2012 17:35:22 +0300 Subject: [PATCH 2/2] dirlisting, palm, logger: Use const mk_pointers where possible
Signed-off-by: Lauri Kasanen <[email protected]> --- plugins/dirlisting/dirlisting.c | 11 +++++------ plugins/dirlisting/dirlisting.h | 6 ++---- plugins/logger/logger.c | 3 --- plugins/logger/logger.h | 2 -- plugins/logger/pointers.c | 38 +++++++++++++++++--------------------- plugins/logger/pointers.h | 31 ++++++++++++++----------------- plugins/palm/palm.c | 13 ++++++------- plugins/palm/palm.h | 7 ++----- 8 files changed, 46 insertions(+), 65 deletions(-) diff --git a/plugins/dirlisting/dirlisting.c b/plugins/dirlisting/dirlisting.c index 9675919..7ad4382 100644 --- a/plugins/dirlisting/dirlisting.c +++ b/plugins/dirlisting/dirlisting.c @@ -49,6 +49,11 @@ MONKEY_PLUGIN("dirlisting", /* shortname */ VERSION, /* version */ MK_PLUGIN_STAGE_30); /* hooks */ +const mk_pointer mk_dirhtml_default_mime = mk_pointer_init(MK_DIRHTML_DEFAULT_MIME); +const mk_pointer mk_iov_dash = mk_pointer_init("-"); +const mk_pointer mk_iov_none = mk_pointer_init(""); +const mk_pointer mk_iov_slash = mk_pointer_init("/"); + /* DIR_HTML logic: * --------------- * [Monkey Start] @@ -200,7 +205,6 @@ int mk_dirhtml_conf(char *confdir) char *conf_file = NULL; mk_api->str_build(&conf_file, &len, "%s", confdir); - mk_api->pointer_set(&mk_dirhtml_default_mime, MK_DIRHTML_DEFAULT_MIME); /* Read configuration */ ret = mk_dirhtml_read_config(conf_file); @@ -795,11 +799,6 @@ int _mkp_init(struct plugin_api **api, char *confdir) { mk_api = *api; - /* Initialize mk pointers */ - mk_api->pointer_set(&mk_iov_none, ""); - mk_api->pointer_set(&mk_iov_dash, "-"); - mk_api->pointer_set(&mk_iov_slash, "/"); - return mk_dirhtml_conf(confdir); } diff --git a/plugins/dirlisting/dirlisting.h b/plugins/dirlisting/dirlisting.h index 4e7521a..4cc65d0 100644 --- a/plugins/dirlisting/dirlisting.h +++ b/plugins/dirlisting/dirlisting.h @@ -77,10 +77,8 @@ struct dirhtml_config }; -mk_pointer mk_dirhtml_default_mime; -mk_pointer mk_iov_none; -mk_pointer mk_iov_dash; -mk_pointer mk_iov_slash; +extern const mk_pointer mk_dirhtml_default_mime; +extern const mk_pointer mk_iov_dash; /* Global config */ struct dirhtml_config *dirhtml_conf; diff --git a/plugins/logger/logger.c b/plugins/logger/logger.c index eddddac..0e6582c 100644 --- a/plugins/logger/logger.c +++ b/plugins/logger/logger.c @@ -321,9 +321,6 @@ int _mkp_init(struct plugin_api **api, char *confdir) } } - /* Init mk_pointers */ - mk_logger_init_pointers(); - return 0; } diff --git a/plugins/logger/logger.h b/plugins/logger/logger.h index f3810f7..ffa5226 100644 --- a/plugins/logger/logger.h +++ b/plugins/logger/logger.h @@ -57,7 +57,5 @@ struct log_target struct mk_list targets_list; -mk_pointer mk_iov_none; - #endif diff --git a/plugins/logger/pointers.c b/plugins/logger/pointers.c index 54e4a8d..9c37711 100644 --- a/plugins/logger/pointers.c +++ b/plugins/logger/pointers.c @@ -23,26 +23,22 @@ #include "pointers.h" #include "mk_plugin.h" -void mk_logger_init_pointers() -{ - /* Writter helpers */ - mk_api->pointer_set(&mk_logger_iov_dash, MK_LOGGER_IOV_DASH); - mk_api->pointer_set(&mk_logger_iov_space, MK_IOV_SPACE); - mk_api->pointer_set(&mk_logger_iov_lf, MK_IOV_LF); - mk_api->pointer_set(&mk_logger_iov_empty, MK_LOGGER_IOV_EMPTY); +const mk_pointer mk_iov_none = mk_pointer_init(""); - /* Error messages */ - mk_api->pointer_set(&error_msg_400, ERROR_MSG_400); - mk_api->pointer_set(&error_msg_403, ERROR_MSG_403); - mk_api->pointer_set(&error_msg_404, ERROR_MSG_404); - mk_api->pointer_set(&error_msg_405, ERROR_MSG_405); - mk_api->pointer_set(&error_msg_408, ERROR_MSG_408); - mk_api->pointer_set(&error_msg_411, ERROR_MSG_411); - mk_api->pointer_set(&error_msg_413, ERROR_MSG_413); - mk_api->pointer_set(&error_msg_500, ERROR_MSG_500); - mk_api->pointer_set(&error_msg_501, ERROR_MSG_501); - mk_api->pointer_set(&error_msg_505, ERROR_MSG_505); +/* Writter helpers */ +const mk_pointer mk_logger_iov_dash = mk_pointer_init(MK_LOGGER_IOV_DASH); +const mk_pointer mk_logger_iov_space = mk_pointer_init(MK_IOV_SPACE); +const mk_pointer mk_logger_iov_lf = mk_pointer_init(MK_IOV_LF); +const mk_pointer mk_logger_iov_empty = mk_pointer_init(MK_LOGGER_IOV_EMPTY); - /* None */ - mk_api->pointer_set(&mk_iov_none, ""); -} +/* Error messages */ +const mk_pointer error_msg_400 = mk_pointer_init(ERROR_MSG_400); +const mk_pointer error_msg_403 = mk_pointer_init(ERROR_MSG_403); +const mk_pointer error_msg_404 = mk_pointer_init(ERROR_MSG_404); +const mk_pointer error_msg_405 = mk_pointer_init(ERROR_MSG_405); +const mk_pointer error_msg_408 = mk_pointer_init(ERROR_MSG_408); +const mk_pointer error_msg_411 = mk_pointer_init(ERROR_MSG_411); +const mk_pointer error_msg_413 = mk_pointer_init(ERROR_MSG_413); +const mk_pointer error_msg_500 = mk_pointer_init(ERROR_MSG_500); +const mk_pointer error_msg_501 = mk_pointer_init(ERROR_MSG_501); +const mk_pointer error_msg_505 = mk_pointer_init(ERROR_MSG_505); diff --git a/plugins/logger/pointers.h b/plugins/logger/pointers.h index a644364..8eb9809 100644 --- a/plugins/logger/pointers.h +++ b/plugins/logger/pointers.h @@ -41,24 +41,21 @@ #define MK_LOGGER_IOV_EMPTY "-" /* mk pointers for errors */ -mk_pointer error_msg_400; -mk_pointer error_msg_403; -mk_pointer error_msg_404; -mk_pointer error_msg_405; -mk_pointer error_msg_408; -mk_pointer error_msg_411; -mk_pointer error_msg_413; -mk_pointer error_msg_500; -mk_pointer error_msg_501; -mk_pointer error_msg_505; +extern const mk_pointer error_msg_400; +extern const mk_pointer error_msg_403; +extern const mk_pointer error_msg_404; +extern const mk_pointer error_msg_405; +extern const mk_pointer error_msg_408; +extern const mk_pointer error_msg_411; +extern const mk_pointer error_msg_413; +extern const mk_pointer error_msg_500; +extern const mk_pointer error_msg_501; +extern const mk_pointer error_msg_505; /* mk pointer for IOV */ -mk_pointer mk_logger_iov_dash; -mk_pointer mk_logger_iov_space; -mk_pointer mk_logger_iov_lf; -mk_pointer mk_logger_iov_empty; - -/* functions */ -void mk_logger_init_pointers(); +extern const mk_pointer mk_logger_iov_dash; +extern const mk_pointer mk_logger_iov_space; +extern const mk_pointer mk_logger_iov_lf; +extern const mk_pointer mk_logger_iov_empty; #endif diff --git a/plugins/palm/palm.c b/plugins/palm/palm.c index dcde6c6..89a70da 100644 --- a/plugins/palm/palm.c +++ b/plugins/palm/palm.c @@ -39,6 +39,12 @@ MONKEY_PLUGIN("palm", /* shortname */ VERSION, /* version */ MK_PLUGIN_CORE_THCTX | MK_PLUGIN_STAGE_30); /* hooks */ +const mk_pointer mk_iov_equal = mk_pointer_init(MK_IOV_EQUAL); +const mk_pointer mk_iov_none = mk_pointer_init(""); +const mk_pointer mk_iov_crlf = mk_pointer_init(MK_IOV_CRLF); +const mk_pointer mk_iov_empty = mk_pointer_init(MK_IOV_NONE); +const mk_pointer mk_iov_crlfcrlf = mk_pointer_init(MK_IOV_CRLFCRLF); + /* Read database configuration parameters */ static int mk_palm_conf(char *confdir) { @@ -222,13 +228,6 @@ int _mkp_init(struct plugin_api **api, char *confdir) mk_api->str_itop(mk_api->config->serverport, &mk_server_port); mk_server_port.len -= 2; - /* iov separators */ - mk_api->pointer_set(&mk_iov_none, ""); - mk_api->pointer_set(&mk_iov_empty, MK_IOV_NONE); - mk_api->pointer_set(&mk_iov_crlf, MK_IOV_CRLF); - mk_api->pointer_set(&mk_iov_crlfcrlf, MK_IOV_CRLFCRLF); - mk_api->pointer_set(&mk_iov_equal, MK_IOV_EQUAL); - /* Read configuration */ mk_palm_conf(confdir); diff --git a/plugins/palm/palm.h b/plugins/palm/palm.h index 77b775e..5319315 100644 --- a/plugins/palm/palm.h +++ b/plugins/palm/palm.h @@ -49,11 +49,8 @@ mk_pointer mk_server_protocol; mk_pointer mk_server_port; mk_pointer mk_server_address; -mk_pointer mk_iov_none; -mk_pointer mk_iov_empty; -mk_pointer mk_iov_crlf; -mk_pointer mk_iov_crlfcrlf; -mk_pointer mk_iov_equal; +extern const mk_pointer mk_iov_empty; +extern const mk_pointer mk_iov_crlfcrlf; struct mk_palm *palms; -- 1.7.2.1
_______________________________________________ Monkey mailing list [email protected] http://lists.monkey-project.com/listinfo/monkey
