diff options
-rw-r--r-- | src/login/logind-action.h | 18 | ||||
-rw-r--r-- | src/login/logind-user.h | 3 | ||||
-rw-r--r-- | src/login/logind.h | 5 |
3 files changed, 9 insertions, 17 deletions
diff --git a/src/login/logind-action.h b/src/login/logind-action.h index 4fdbc60e4..74b1dc88f 100644 --- a/src/login/logind-action.h +++ b/src/login/logind-action.h @@ -5,21 +5,10 @@ This file is part of systemd. Copyright 2012 Lennart Poettering - - elogind is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - elogind is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with elogind; If not, see <http://www.gnu.org/licenses/>. ***/ +//#include "conf-parser.h" + typedef enum HandleAction { HANDLE_IGNORE, HANDLE_POWEROFF, @@ -49,4 +38,5 @@ const char* handle_action_to_string(HandleAction h) _const_; HandleAction handle_action_from_string(const char *s) _pure_; const char* manager_target_for_action(HandleAction handle); -int config_parse_handle_action(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); + +CONFIG_PARSER_PROTOTYPE(config_parse_handle_action); diff --git a/src/login/logind-user.h b/src/login/logind-user.h index c80b02271..ad830206c 100644 --- a/src/login/logind-user.h +++ b/src/login/logind-user.h @@ -9,6 +9,7 @@ typedef struct User User; +//#include "conf-parser.h" #include "list.h" #include "logind.h" @@ -82,4 +83,4 @@ UserState user_state_from_string(const char *s) _pure_; int bus_user_method_terminate(sd_bus_message *message, void *userdata, sd_bus_error *error); int bus_user_method_kill(sd_bus_message *message, void *userdata, sd_bus_error *error); -int config_parse_compat_user_tasks_max(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); +CONFIG_PARSER_PROTOTYPE(config_parse_compat_user_tasks_max); diff --git a/src/login/logind.h b/src/login/logind.h index 52e41680b..be276170c 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -17,6 +17,7 @@ #include "sd-bus.h" #include "sd-event.h" +//#include "conf-parser.h" #include "hashmap.h" #include "list.h" #include "set.h" @@ -231,8 +232,8 @@ const struct ConfigPerfItem* logind_gperf_lookup(const char *key, GPERF_LEN_TYPE int manager_set_lid_switch_ignore(Manager *m, usec_t until); -int config_parse_n_autovts(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); -int config_parse_tmpfs_size(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); +CONFIG_PARSER_PROTOTYPE(config_parse_n_autovts); +CONFIG_PARSER_PROTOTYPE(config_parse_tmpfs_size); int manager_get_session_from_creds(Manager *m, sd_bus_message *message, const char *name, sd_bus_error *error, Session **ret); int manager_get_user_from_creds(Manager *m, sd_bus_message *message, uid_t uid, sd_bus_error *error, User **ret); |