X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Futil.h;h=19edf98355d3f3c0913e1a41797bb0a19e59c8b7;hp=3915904442e2047ba7993832429c61812213f141;hb=5809560d858f45351856d6fe786a8117306dd0f2;hpb=d05c5031ad4c528fe6bbfed289519edb9f13180a diff --git a/src/shared/util.h b/src/shared/util.h index 391590444..19edf9835 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -1,7 +1,6 @@ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ -#ifndef fooutilhfoo -#define fooutilhfoo +#pragma once /*** This file is part of systemd. @@ -257,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); @@ -375,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); @@ -418,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); @@ -531,5 +528,3 @@ void warn_melody(void); int get_shell(char **ret); int get_home_dir(char **ret); - -#endif