Merge branch 'hostnamectl-dot-v2'

Manual merge of https://github.com/systemd/systemd/pull/751.
2015-08-05 21:02:41 -04:00
parent 4306d66f59 90365b043a
commit 73974f6768
18 changed files with 223 additions and 112 deletions
@@ -864,6 +864,11 @@ int unquote_first_word(const char **p, char **ret, UnquoteFlags flags);
 int unquote_first_word_and_warn(const char **p, char **ret, UnquoteFlags flags, const char *unit, const char *filename, unsigned line, const char *rvalue);
 int unquote_many_words(const char **p, UnquoteFlags flags, ...) _sentinel_;

+static inline void free_and_replace(char **s, char *v) {
+        free(*s);
+        *s = v;
+}
+
 int free_and_strdup(char **p, const char *s);

 #define INOTIFY_EVENT_MAX (sizeof(struct inotify_event) + NAME_MAX + 1)