From: Sven Eden Date: Tue, 4 Jul 2017 15:09:23 +0000 (+0200) Subject: Prep v232: Mask new functions that are unneeded by elogind X-Git-Tag: v232.2~10 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d039bb6e747bf119406f28a63fac10b7970260b7 Prep v232: Mask new functions that are unneeded by elogind --- diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 16e299a7e..64220ac08 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -889,7 +889,6 @@ int cg_set_task_access( return 0; } -#endif // 0 int cg_set_xattr(const char *controller, const char *path, const char *name, const void *value, size_t size, int flags) { _cleanup_free_ char *fs = NULL; @@ -927,6 +926,7 @@ int cg_get_xattr(const char *controller, const char *path, const char *name, voi return (int) n; } +#endif // 0 int cg_pid_get_path(const char *controller, pid_t pid, char **path) { _cleanup_fclose_ FILE *f = NULL; diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h index 327a525bf..27ab8d693 100644 --- a/src/basic/cgroup-util.h +++ b/src/basic/cgroup-util.h @@ -189,10 +189,10 @@ int cg_get_keyed_attribute(const char *controller, const char *path, const char #if 0 /// UNNEEDED by elogind int cg_set_group_access(const char *controller, const char *path, mode_t mode, uid_t uid, gid_t gid); int cg_set_task_access(const char *controller, const char *path, mode_t mode, uid_t uid, gid_t gid); -#endif // 0 int cg_set_xattr(const char *controller, const char *path, const char *name, const void *value, size_t size, int flags); int cg_get_xattr(const char *controller, const char *path, const char *name, void *value, size_t size); +#endif // 0 int cg_install_release_agent(const char *controller, const char *agent); int cg_uninstall_release_agent(const char *controller); @@ -253,9 +253,9 @@ int cg_kernel_controllers(Set *controllers); bool cg_ns_supported(void); #endif // 0 -#if 0 /// UNNEEDED by elogind int cg_all_unified(void); int cg_unified(const char *controller); +#if 0 /// UNNEEDED by elogind void cg_unified_flush(void); bool cg_is_unified_wanted(void); diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c index bfdf48322..b1cad55e7 100644 --- a/src/basic/parse-util.c +++ b/src/basic/parse-util.c @@ -567,6 +567,7 @@ int parse_percent(const char *p) { return v; } +#if 0 /// UNNEEDED by elogind int parse_nice(const char *p, int *ret) { int n, r; @@ -580,3 +581,4 @@ int parse_nice(const char *p, int *ret) { *ret = n; return 0; } +#endif // 0 diff --git a/src/basic/parse-util.h b/src/basic/parse-util.h index 2bcbadecf..23b193743 100644 --- a/src/basic/parse-util.h +++ b/src/basic/parse-util.h @@ -111,4 +111,6 @@ int parse_fractional_part_u(const char **s, size_t digits, unsigned *res); int parse_percent_unbounded(const char *p); int parse_percent(const char *p); +#if 0 /// UNNEEDED by elogind int parse_nice(const char *p, int *ret); +#endif // 0 diff --git a/src/basic/path-util.c b/src/basic/path-util.c index 3422340b6..8cb013e6c 100644 --- a/src/basic/path-util.c +++ b/src/basic/path-util.c @@ -34,7 +34,6 @@ #include "alloc-util.h" #include "extract-word.h" #include "fs-util.h" -#include "glob-util.h" #include "log.h" #include "macro.h" #include "missing.h" @@ -835,7 +834,6 @@ bool is_deviceallow_pattern(const char *path) { startswith(path, "block-") || startswith(path, "char-"); } -#endif // 0 int systemd_installation_has_version(const char *root, unsigned minimal_version) { const char *pattern; @@ -902,3 +900,4 @@ int systemd_installation_has_version(const char *root, unsigned minimal_version) return false; } +#endif // 0 diff --git a/src/basic/path-util.h b/src/basic/path-util.h index cdb194d2a..605485665 100644 --- a/src/basic/path-util.h +++ b/src/basic/path-util.h @@ -140,7 +140,7 @@ bool hidden_or_backup_file(const char *filename) _pure_; #if 0 /// UNNEEDED by elogind bool is_device_path(const char *path); -#endif // 0 bool is_deviceallow_pattern(const char *path); int systemd_installation_has_version(const char *root, unsigned minimal_version); +#endif // 0 diff --git a/src/basic/process-util.h b/src/basic/process-util.h index 6a41db184..c05d05d78 100644 --- a/src/basic/process-util.h +++ b/src/basic/process-util.h @@ -114,6 +114,8 @@ void valgrind_summary_hack(void); int pid_compare_func(const void *a, const void *b); +#if 0 /// UNNEEDED by elogind static inline bool nice_is_valid(int n) { return n >= PRIO_MIN && n < PRIO_MAX; } +#endif // 0 diff --git a/src/libelogind/sd-bus/bus-common-errors.c b/src/libelogind/sd-bus/bus-common-errors.c index ed3f5fa38..ca0271006 100644 --- a/src/libelogind/sd-bus/bus-common-errors.c +++ b/src/libelogind/sd-bus/bus-common-errors.c @@ -54,9 +54,9 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_common_errors[] = { SD_BUS_ERROR_MAP(BUS_ERROR_NO_MACHINE_FOR_PID, ENXIO), SD_BUS_ERROR_MAP(BUS_ERROR_MACHINE_EXISTS, EEXIST), SD_BUS_ERROR_MAP(BUS_ERROR_NO_PRIVATE_NETWORKING, ENOSYS), -#endif // 0 SD_BUS_ERROR_MAP(BUS_ERROR_NO_SUCH_USER_MAPPING, ENXIO), SD_BUS_ERROR_MAP(BUS_ERROR_NO_SUCH_GROUP_MAPPING, ENXIO), +#endif // 0 SD_BUS_ERROR_MAP(BUS_ERROR_NO_SUCH_SESSION, ENXIO), SD_BUS_ERROR_MAP(BUS_ERROR_NO_SESSION_FOR_PID, ENXIO), diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index d22a613af..8bba92092 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -1334,6 +1334,7 @@ int bus_property_get_bool( return sd_bus_message_append_basic(reply, 'b', &b); } +#if 0 /// UNNEEDED by elogind int bus_property_get_id128( sd_bus *bus, const char *path, @@ -1350,6 +1351,7 @@ int bus_property_get_id128( else return sd_bus_message_append_array(reply, 'y', id->bytes, 16); } +#endif // 0 #if __SIZEOF_SIZE_T__ != 8 int bus_property_get_size( diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h index 802983766..614f626e0 100644 --- a/src/shared/bus-util.h +++ b/src/shared/bus-util.h @@ -91,7 +91,9 @@ int bus_print_property(const char *name, sd_bus_message *property, bool value, b int bus_print_all_properties(sd_bus *bus, const char *dest, const char *path, char **filter, bool value, bool all); int bus_property_get_bool(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error); +#if 0 /// UNNEEDED by elogind int bus_property_get_id128(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error); +#endif // 0 #define bus_property_get_usec ((sd_bus_property_get_t) NULL) #define bus_property_set_usec ((sd_bus_property_set_t) NULL) diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index 92baba603..9190ec9b8 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -443,6 +443,7 @@ int config_parse_many_nulstr( sections, lookup, table, relaxed, userdata); } +#if 0 /// UNNEEDED by elogind /* Parse each config file in the directories specified as strv. */ int config_parse_many( const char *conf_file, @@ -471,6 +472,7 @@ int config_parse_many( return config_parse_many_files(conf_file, files, sections, lookup, table, relaxed, userdata); } +#endif // 0 #define DEFINE_PARSER(type, vartype, conv_func) \ int config_parse_##type( \ diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h index 2ca5aa63c..fe93c3c1e 100644 --- a/src/shared/conf-parser.h +++ b/src/shared/conf-parser.h @@ -105,6 +105,7 @@ int config_parse_many_nulstr( bool relaxed, void *userdata); +#if 0 /// UNNEEDED by elogind int config_parse_many( const char *conf_file, /* possibly NULL */ const char* const* conf_file_dirs, @@ -114,6 +115,7 @@ int config_parse_many( const void *table, bool relaxed, void *userdata); +#endif // 0 /* Generic parsers */ int config_parse_int(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);