uniformly suffix time span properties with their unit

[elogind.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index 91e0359e0c15d612a5c4ac264e96cb29bc6d50fb..50bac6edf81ca8588132ce7cc0e216c9ab601fc4 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
+#include <sched.h>
 
 #include "macro.h"
 
@@ -226,7 +227,8 @@ unsigned long long random_ull(void);
                 unsigned u = 0;                                         \
                 assert(s);                                              \
                 for (i = 0; i < (type)ELEMENTSOF(name##_table); i++)    \
-                        if (streq(name##_table[i], s))                  \
+                        if (name##_table[i] &&                          \
+                            streq(name##_table[i], s))                  \
                                 return i;                               \
                 if (safe_atou(s, &u) >= 0 &&                            \
                     u < ELEMENTSOF(name##_table))                       \
@@ -283,6 +285,8 @@ int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid);
 
 int rm_rf(const char *path, bool only_dirs, bool delete_root);
 
+cpu_set_t* cpu_set_malloc(unsigned *ncpus);
+
 const char *ioprio_class_to_string(int i);
 int ioprio_class_from_string(const char *s);
 
@@ -301,4 +305,7 @@ int sched_policy_from_string(const char *s);
 const char *rlimit_to_string(int i);
 int rlimit_from_string(const char *s);
 
+const char *ip_tos_to_string(int i);
+int ip_tos_from_string(const char *s);
+
 #endif