chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: move syslog specific calls out of util.c
[elogind.git]
/
src
/
shared
/
util.h
diff --git
a/src/shared/util.h
b/src/shared/util.h
index d3546ba1cdbaa9e4bef7ef700cc3fe16baecb40e..19edf98355d3f3c0913e1a41797bb0a19e59c8b7 100644
(file)
--- a/
src/shared/util.h
+++ b/
src/shared/util.h
@@
-1,7
+1,6
@@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef fooutilhfoo
-#define fooutilhfoo
+#pragma once
/***
This file is part of systemd.
/***
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 *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);
char *xescape(const char *s, const char *bad);
@@
-375,6
+375,7
@@
void status_welcome(void);
int fd_columns(int fd);
unsigned columns(void);
int fd_columns(int fd);
unsigned columns(void);
+unsigned columns_uncached(void);
int fd_lines(int fd);
unsigned lines(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);
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);
bool hostname_is_valid(const char *s);
char* hostname_cleanup(char *s);
@@
-441,7
+438,7
@@
int fchmod_umask(int fd, mode_t mode);
bool display_is_local(const char *display);
int socket_from_display(const char *display, char **path);
bool display_is_local(const char *display);
int socket_from_display(const char *display, char **path);
-int get_user_creds(const char **username, uid_t *uid, gid_t *gid, const char **home);
+int get_user_creds(const char **username, uid_t *uid, gid_t *gid, const char **home
, const char **shell
);
int get_group_creds(const char **groupname, gid_t *gid);
int in_group(const char *name);
int get_group_creds(const char **groupname, gid_t *gid);
int in_group(const char *name);
@@
-531,5
+528,3
@@
void warn_melody(void);
int get_shell(char **ret);
int get_home_dir(char **ret);
int get_shell(char **ret);
int get_home_dir(char **ret);
-
-#endif