From 74b55d4d6dd6b3acfb2a40461611eef72906daaf Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Thu, 6 Jun 2013 18:19:05 -0400 Subject: Remove unused DECLS from src/libudev/{conf-files,def,exit-status,hashmap,util}.h The following unused DECLS are removed: DEFAULT_TIMEOUT_USEC DEFAULT_RESTART_USEC DEFAULT_CONFIRM_USEC DEFAULT_EXIT_USEC SIGNALS_CRASH_HANDLER SIGNALS_IGNORE EXIT_INVALIDARGUMENT EXIT_NOTIMPLEMENTED EXIT_NOPERMISSION EXIT_NOTINSTALLED EXIT_NOTCONFIGURED EXIT_NOTRUNNING EXIT_CHDIR EXIT_NICE EXIT_FDS EXIT_EXEC EXIT_MEMORY EXIT_LIMITS EXIT_OOM_ADJUST EXIT_SIGNAL_MASK EXIT_STDIN EXIT_STDOUT EXIT_CHROOT EXIT_IOPRI EXIT_TIMERSLACK EXIT_SECUREBITS EXIT_SETSCHEDULER EXIT_CPUAFFINITY EXIT_GROUP EXIT_USER EXIT_CAPABILITIES EXIT_CGROUP EXIT_SETSID EXIT_CONFIRM EXIT_STDERR EXIT_TCPWRAP EXIT_PAM EXIT_NETWORK EXIT_NAMESPACE EXIT_NO_NEW_PRIVILEGES EXIT_SECCOMP EXIT_STATUS_MINIMAL EXIT_STATUS_SYSTEMD EXIT_STATUS_LSB EXIT_STATUS_FULL HASHMAP_FOREACH_KEY HASHMAP_FOREACH_BACKWARDS FORMAT_TIMESTAMP_MAX FORMAT_TIMESTAMP_PRETTY_MAX FORMAT_TIMESPAN_MAX FORMAT_BYTES_MAX ANSI_HIGHLIGHT_ON ANSI_RED_ON ANSI_HIGHLIGHT_RED_ON dual_timestamp_is_set newa newdup FOREACH_WORD FOREACH_WORD_SEPARATOR NULSTR_FOREACH _cleanup_pclose_ _cleanup_umask_ _cleanup_globfree_ DRAW_TREE_VERT DRAW_TREE_BRANCH DRAW_TREE_RIGHT DRAW_TREE_SPACE DRAW_TRIANGULAR_BULLET _DRAW_SPECIAL_CHAR_MAX FOREACH_LINE procfs_file_alloca The following unused struct defs were removed: struct ExitStatusSet The following unused static inline funcs were remvoed: static inline int safe_atolu static inline int safe_atoli static inline int safe_atolu static inline int safe_atoli static inline int safe_atou32 static inline int safe_atoi32 static inline int safe_atou64 static inline int safe_atoi64 static inline const char* yes_no static inline const char* strempty static inline const char* strnull static inline const char *strna static inline void pclosep static inline void umaskp NOTE: Some unused DECLS were retained if they formed part of a logical series, eg. definition of time units. Signed-off-by: Anthony G. Basile --- src/libudev/conf-files.h | 2 - src/libudev/def.h | 9 ---- src/libudev/exit-status.h | 56 -------------------- src/libudev/hashmap.h | 6 --- src/libudev/util.h | 129 ---------------------------------------------- 5 files changed, 202 deletions(-) (limited to 'src') diff --git a/src/libudev/conf-files.h b/src/libudev/conf-files.h index 8fdf9a4632..a0720dc2cc 100644 --- a/src/libudev/conf-files.h +++ b/src/libudev/conf-files.h @@ -23,8 +23,6 @@ along with systemd; If not, see . ***/ -#include "macro.h" - int conf_files_list_strv(char ***strv, const char *suffix, const char *root, const char* const* dirs); #endif diff --git a/src/libudev/def.h b/src/libudev/def.h index 5ba170f965..3c44e27121 100644 --- a/src/libudev/def.h +++ b/src/libudev/def.h @@ -23,13 +23,4 @@ #include "util.h" -#define DEFAULT_TIMEOUT_USEC (90*USEC_PER_SEC) -#define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC) -#define DEFAULT_CONFIRM_USEC (30*USEC_PER_SEC) - -#define DEFAULT_EXIT_USEC (5*USEC_PER_MINUTE) - #define SYSTEMD_CGROUP_CONTROLLER "name=systemd" - -#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT -#define SIGNALS_IGNORE SIGKILL,SIGPIPE diff --git a/src/libudev/exit-status.h b/src/libudev/exit-status.h index 8cf4e5e9a2..c8bda70a8a 100644 --- a/src/libudev/exit-status.h +++ b/src/libudev/exit-status.h @@ -21,64 +21,8 @@ along with systemd; If not, see . ***/ -#include -#include "macro.h" #include "set.h" -typedef enum ExitStatus { - /* EXIT_SUCCESS defined by libc */ - /* EXIT_FAILURE defined by libc */ - EXIT_INVALIDARGUMENT = 2, - EXIT_NOTIMPLEMENTED = 3, - EXIT_NOPERMISSION = 4, - EXIT_NOTINSTALLED = 5, - EXIT_NOTCONFIGURED = 6, - EXIT_NOTRUNNING = 7, - - /* The LSB suggests that error codes >= 200 are "reserved". We - * use them here under the assumption that they hence are - * unused by init scripts. - * - * http://refspecs.freestandards.org/LSB_3.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html */ - - EXIT_CHDIR = 200, - EXIT_NICE, - EXIT_FDS, - EXIT_EXEC, - EXIT_MEMORY, - EXIT_LIMITS, - EXIT_OOM_ADJUST, - EXIT_SIGNAL_MASK, - EXIT_STDIN, - EXIT_STDOUT, - EXIT_CHROOT, /* 210 */ - EXIT_IOPRIO, - EXIT_TIMERSLACK, - EXIT_SECUREBITS, - EXIT_SETSCHEDULER, - EXIT_CPUAFFINITY, - EXIT_GROUP, - EXIT_USER, - EXIT_CAPABILITIES, - EXIT_CGROUP, - EXIT_SETSID, /* 220 */ - EXIT_CONFIRM, - EXIT_STDERR, - EXIT_TCPWRAP, - EXIT_PAM, - EXIT_NETWORK, - EXIT_NAMESPACE, - EXIT_NO_NEW_PRIVILEGES, - EXIT_SECCOMP -} ExitStatus; - -typedef enum ExitStatusLevel { - EXIT_STATUS_MINIMAL, - EXIT_STATUS_SYSTEMD, - EXIT_STATUS_LSB, - EXIT_STATUS_FULL = EXIT_STATUS_LSB -} ExitStatusLevel; - typedef struct ExitStatusSet { Set *code; Set *signal; diff --git a/src/libudev/hashmap.h b/src/libudev/hashmap.h index 5135c885a0..3b65142eca 100644 --- a/src/libudev/hashmap.h +++ b/src/libudev/hashmap.h @@ -71,9 +71,3 @@ char **hashmap_get_strv(Hashmap *h); #define HASHMAP_FOREACH(e, h, i) \ for ((i) = ITERATOR_FIRST, (e) = hashmap_iterate((h), &(i), NULL); (e); (e) = hashmap_iterate((h), &(i), NULL)) - -#define HASHMAP_FOREACH_KEY(e, k, h, i) \ - for ((i) = ITERATOR_FIRST, (e) = hashmap_iterate((h), &(i), (const void**) &(k)); (e); (e) = hashmap_iterate((h), &(i), (const void**) &(k))) - -#define HASHMAP_FOREACH_BACKWARDS(e, h, i) \ - for ((i) = ITERATOR_LAST, (e) = hashmap_iterate_backwards((h), &(i), NULL); (e); (e) = hashmap_iterate_backwards((h), &(i), NULL)) diff --git a/src/libudev/util.h b/src/libudev/util.h index f98e6ee9ac..d44fcc2e4f 100644 --- a/src/libudev/util.h +++ b/src/libudev/util.h @@ -21,21 +21,13 @@ along with systemd; If not, see . ***/ -#include -#include #include -#include -#include -#include #include #include -#include #include -#include #include #include #include -#include #include #include @@ -81,11 +73,6 @@ union dirent_storage { #define QUOTES "\"\'" #define COMMENTS "#;" -#define FORMAT_TIMESTAMP_MAX (5+11+9+4+1) -#define FORMAT_TIMESTAMP_PRETTY_MAX 256 -#define FORMAT_TIMESPAN_MAX 64 -#define FORMAT_BYTES_MAX 8 - #define ANSI_HIGHLIGHT_ON "\x1B[1;39m" #define ANSI_RED_ON "\x1B[31m" #define ANSI_HIGHLIGHT_RED_ON "\x1B[1;31m" @@ -96,9 +83,6 @@ union dirent_storage { #define ANSI_ERASE_TO_END_OF_LINE "\x1B[K" usec_t now(clockid_t clock); - -#define dual_timestamp_is_set(ts) ((ts)->realtime > 0) - usec_t timespec_load(const struct timespec *ts); size_t page_size(void); @@ -110,31 +94,9 @@ size_t page_size(void); bool streq_ptr(const char *a, const char *b) _pure_; #define new(t, n) ((t*) malloc_multiply(sizeof(t), (n))) - #define new0(t, n) ((t*) calloc((n), sizeof(t))) - -#define newa(t, n) ((t*) alloca(sizeof(t)*(n))) - -#define newdup(t, p, n) ((t*) memdup_multiply(p, sizeof(t), (n))) - #define malloc0(n) (calloc((n), 1)) -static inline const char* yes_no(bool b) { - return b ? "yes" : "no"; -} - -static inline const char* strempty(const char *s) { - return s ? s : ""; -} - -static inline const char* strnull(const char *s) { - return s ? s : "(null)"; -} - -static inline const char *strna(const char *s) { - return s ? s : "n/a"; -} - static inline bool isempty(const char *p) { return !p || !p[0]; } @@ -151,55 +113,9 @@ int safe_atoi(const char *s, int *ret_i); int safe_atollu(const char *s, unsigned long long *ret_u); int safe_atolli(const char *s, long long int *ret_i); -#if __WORDSIZE == 32 -static inline int safe_atolu(const char *s, unsigned long *ret_u) { - assert_cc(sizeof(unsigned long) == sizeof(unsigned)); - return safe_atou(s, (unsigned*) ret_u); -} -static inline int safe_atoli(const char *s, long int *ret_u) { - assert_cc(sizeof(long int) == sizeof(int)); - return safe_atoi(s, (int*) ret_u); -} -#else -static inline int safe_atolu(const char *s, unsigned long *ret_u) { - assert_cc(sizeof(unsigned long) == sizeof(unsigned long long)); - return safe_atollu(s, (unsigned long long*) ret_u); -} -static inline int safe_atoli(const char *s, long int *ret_u) { - assert_cc(sizeof(long int) == sizeof(long long int)); - return safe_atolli(s, (long long int*) ret_u); -} -#endif - -static inline int safe_atou32(const char *s, uint32_t *ret_u) { - assert_cc(sizeof(uint32_t) == sizeof(unsigned)); - return safe_atou(s, (unsigned*) ret_u); -} - -static inline int safe_atoi32(const char *s, int32_t *ret_i) { - assert_cc(sizeof(int32_t) == sizeof(int)); - return safe_atoi(s, (int*) ret_i); -} - -static inline int safe_atou64(const char *s, uint64_t *ret_u) { - assert_cc(sizeof(uint64_t) == sizeof(unsigned long long)); - return safe_atollu(s, (unsigned long long*) ret_u); -} - -static inline int safe_atoi64(const char *s, int64_t *ret_i) { - assert_cc(sizeof(int64_t) == sizeof(long long int)); - return safe_atolli(s, (long long int*) ret_i); -} - char *split(const char *c, size_t *l, const char *separator, char **state); char *split_quoted(const char *c, size_t *l, char **state); -#define FOREACH_WORD(word, length, s, state) \ - for ((state) = NULL, (word) = split((s), &(length), WHITESPACE, &(state)); (word); (word) = split((s), &(length), WHITESPACE, &(state))) - -#define FOREACH_WORD_SEPARATOR(word, length, s, separator, state) \ - for ((state) = NULL, (word) = split((s), &(length), (separator), &(state)); (word); (word) = split((s), &(length), (separator), &(state))) - #define FOREACH_WORD_QUOTED(word, length, s, state) \ for ((state) = NULL, (word) = split_quoted((s), &(length), &(state)); (word); (word) = split_quoted((s), &(length), &(state))) @@ -284,9 +200,6 @@ char *strjoin(const char *x, ...) _sentinel_; bool is_main_thread(void); -#define NULSTR_FOREACH(i, l) \ - for ((i) = (l); (i) && *(i); (i) = strchr((i), 0)+1) - #define NULSTR_FOREACH_PAIR(i, j, l) \ for ((i) = (l), (j) = strchr((i), 0)+1; (i) && *(i); (i) = strchr((j), 0)+1, (j) = *(i) ? strchr((i), 0)+1 : (i)) @@ -329,11 +242,6 @@ static inline void fclosep(FILE **f) { fclose(*f); } -static inline void pclosep(FILE **f) { - if (*f) - pclose(*f); -} - static inline void closep(int *fd) { if (*fd >= 0) close_nointr_nofail(*fd); @@ -344,17 +252,10 @@ static inline void closedirp(DIR **d) { closedir(*d); } -static inline void umaskp(mode_t *u) { - umask(*u); -} - #define _cleanup_free_ _cleanup_(freep) #define _cleanup_fclose_ _cleanup_(fclosep) -#define _cleanup_pclose_ _cleanup_(pclosep) #define _cleanup_close_ _cleanup_(closep) #define _cleanup_closedir_ _cleanup_(closedirp) -#define _cleanup_umask_ _cleanup_(umaskp) -#define _cleanup_globfree_ _cleanup_(globfree) _malloc_ _alloc_(1, 2) static inline void *malloc_multiply(size_t a, size_t b) { if (_unlikely_(b == 0 || a > ((size_t) -1) / b)) @@ -367,38 +268,8 @@ void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, int (*compar) (const void *, const void *, void *), void *arg); -typedef enum DrawSpecialChar { - DRAW_TREE_VERT, - DRAW_TREE_BRANCH, - DRAW_TREE_RIGHT, - DRAW_TREE_SPACE, - DRAW_TRIANGULAR_BULLET, - _DRAW_SPECIAL_CHAR_MAX -} DrawSpecialChar; - - -#define FOREACH_LINE(line, f, on_error) \ - for (;;) \ - if (!fgets(line, sizeof(line), f)) { \ - if (ferror(f)) { \ - on_error; \ - } \ - break; \ - } else - - static inline void _reset_errno_(int *saved_errno) { errno = *saved_errno; } #define PROTECT_ERRNO _cleanup_(_reset_errno_) __attribute__((unused)) int _saved_errno_ = errno - -#define procfs_file_alloca(pid, field) \ - ({ \ - pid_t _pid_ = (pid); \ - char *_r_; \ - _r_ = alloca(sizeof("/proc/") -1 + DECIMAL_STR_MAX(pid_t) + 1 + sizeof(field)); \ - sprintf(_r_, "/proc/%lu/" field, (unsigned long) _pid_); \ - _r_; \ - }) - -- cgit v1.2.3-54-g00ecf