util: modernize a few functions with automatic cleanup variables

[elogind.git] / src / shared / util.h

diff --git a/src/shared/util.h b/src/shared/util.h
index d25b7ee1ee4c9925224cd027d6725d7d85f524ea..90234eb27b8577f5c75c349f711e4d340c4c71f2 100644 (file)
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -256,6 +256,7 @@ int undecchar(char c);
 char *cescape(const char *s);
 char *cunescape(const char *s);
 char *cunescape_length(const char *s, size_t length);
+char *cunescape_length_with_prefix(const char *s, size_t length, const char *prefix);
 
 char *xescape(const char *s, const char *bad);
 
@@ -374,6 +375,7 @@ void status_welcome(void);
 
 int fd_columns(int fd);
 unsigned columns(void);
+unsigned columns_uncached(void);
 
 int fd_lines(int fd);
 unsigned lines(void);
@@ -417,10 +419,6 @@ bool nulstr_contains(const char*nulstr, const char *needle);
 
 bool plymouth_running(void);
 
-void parse_syslog_priority(char **p, int *priority);
-void skip_syslog_pid(char **buf);
-void skip_syslog_date(char **buf);
-
 bool hostname_is_valid(const char *s);
 char* hostname_cleanup(char *s);
 
@@ -530,3 +528,7 @@ void warn_melody(void);
 
 int get_shell(char **ret);
 int get_home_dir(char **ret);
+
+void freep(void *p);
+void fclosep(FILE **f);
+void closep(int *fd);